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-02 11:56:06 +0200 |
| commit | fdc0646512c920acb69a03b44d0f59e965e208f9 (patch) | |
| tree | a06643a84a387de2c7643ba84f2fee66770b1a11 /configure.ac | |
| parent | 210add29399c1a1270557eff4466908f406819d7 (diff) | |
nss: build with zlib module on WNTco-21.06.24-1
Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132367
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
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 802d6c0b3fa5..aa9206171e06 100644 --- a/configure.ac +++ b/configure.ac @@ -8907,7 +8907,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) |