diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-03-31 20:33:02 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-04-05 13:29:24 +0200 |
| commit | 92e5b15dd5adb8522052eb53ca2e1fc048400ea2 (patch) | |
| tree | 332bfa3710785ac739e2d73c8510e6737fe40b5a /configure.ac | |
| parent | fefc8dd41ee6dfb2f68d23d5fb9e843dc9e7d09e (diff) | |
nss: build with zlib module on WNT
Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6
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)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132376
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
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 06d77468a501..aaef60bdf15f 100644 --- a/configure.ac +++ b/configure.ac @@ -8833,7 +8833,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) |