diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-03-31 20:33:02 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-04-02 12:15:13 +0200 |
| commit | dcdd921324bda73543518f1eb3f0e25f1a2ad3b0 (patch) | |
| tree | 34196a46bf081ca27df3e31ed9a4d76c3ae58c24 /configure.ac | |
| parent | 7a7cb1a7ea2bd81712880f87340dc282d124e52b (diff) | |
nss: build with zlib module on WNT
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132367
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 1c748fefc3c5b42e3548a1a7f5017a579982005a)
Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 3bd8a43eb690..6e169111616e 100644 --- a/configure.ac +++ b/configure.ac @@ -7763,7 +7763,11 @@ else SYSTEM_ZLIB= BUILD_TYPE="$BUILD_TYPE ZLIB" ZLIB_CFLAGS="-I${WORKDIR}/UnpackedTarball/zlib" - ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib" + if test "$COM" = "MSC"; then + ZLIB_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/zlib.lib" + else + ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib" + fi fi AC_SUBST(ZLIB_CFLAGS) AC_SUBST(ZLIB_LIBS) |