configure.ac | 2 +- liborcus/ExternalProject_liborcus.mk | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit cc8e169d6cddc081e2a8b5249f34169c0e41d7d3 Author: Stephan Bergmann <[email protected]> Date: Fri Mar 22 10:02:30 2013 +0100 liborcus depends on zlib ...at least unless configured --without-gnumeric-filter, see its configure.ac: "The gnumeric import filter depends on zLib." Change-Id: Ied3fb0119978ed484c5e0668cd6a949b448e1ee0 diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index c725345..21db367 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -13,7 +13,10 @@ $(eval $(call gb_ExternalProject_use_unpacked,liborcus,orcus)) $(eval $(call gb_ExternalProject_use_autoconf,liborcus,build)) -$(eval $(call gb_ExternalProject_use_external,liborcus,boost_headers)) +$(eval $(call gb_ExternalProject_use_externals,liborcus, \ + boost_headers \ + zlib \ +)) $(eval $(call gb_ExternalProject_register_targets,liborcus,\ build \ commit 1939c8c89bc2a92b3ab90b27632ab5a97b9d7e2a Author: Stephan Bergmann <[email protected]> Date: Fri Mar 22 10:01:27 2013 +0100 Our internal (static) zlib library is called "zlib", not "z" Change-Id: Ied4b734a412546558b049b1fc627c421b61a0629 diff --git a/configure.ac b/configure.ac index 54a4a10..9a69275 100644 --- a/configure.ac +++ b/configure.ac @@ -6967,7 +6967,7 @@ else SYSTEM_ZLIB=NO BUILD_TYPE="$BUILD_TYPE ZLIB" ZLIB_CFLAGS="-I${OUTDIR}/inc/external/zlib" - ZLIB_LIBS="-L${OUTDIR}/lib -lz" + ZLIB_LIBS="-L${OUTDIR}/lib -lzlib" fi AC_SUBST(ZLIB_CFLAGS) AC_SUBST(ZLIB_LIBS) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
