[Libreoffice-commits] core.git: configure.ac

[Stephan Bergmann]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 55828bef6926a0eec446ca0b8503f656cc5c4a7f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 20 11:36:05 2015 +0200

    Make ZLIB_LIBS self-contained so that external modules can use it
    
    ...as e.g. external/libetonyek/ExternalProject_libetonyek.mk internally does in its
    configure script (but where workdir/LinkTarget/StaticLibrary is not on the lib search
    path during linking)
    
    Change-Id: I636d3de5c831eb8ced002ec61806ccaf75cf4c91

diff --git a/configure.ac b/configure.ac
index e016794..a71b565 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7415,7 +7415,7 @@ else
     SYSTEM_ZLIB=
     BUILD_TYPE="$BUILD_TYPE ZLIB"
     ZLIB_CFLAGS="-I${WORKDIR}/UnpackedTarball/zlib"
-    ZLIB_LIBS="-lzlib"
+    ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib"
 fi
 AC_SUBST(ZLIB_CFLAGS)
 AC_SUBST(ZLIB_LIBS)