r17740 - gnucash/branches/2.2 - [r17683] Bug #536299 – Fix missing explicit linking of libz

Christian Stimming cstim at cvs.gnucash.org
Thu Nov 27 06:57:27 EST 2008


Author: cstim
Date: 2008-11-27 06:57:27 -0500 (Thu, 27 Nov 2008)
New Revision: 17740
Trac: http://svn.gnucash.org/trac/changeset/17740

Modified:
   gnucash/branches/2.2/configure.in
   gnucash/branches/2.2/src/backend/file/Makefile.am
Log:
[r17683] Bug #536299 – Fix missing explicit linking of libz

Patch by andi5.

Modified: gnucash/branches/2.2/configure.in
===================================================================
--- gnucash/branches/2.2/configure.in	2008-11-27 11:18:33 UTC (rev 17739)
+++ gnucash/branches/2.2/configure.in	2008-11-27 11:57:27 UTC (rev 17740)
@@ -532,6 +532,19 @@
 LIBS="$oLIBS"
 
 ### --------------------------------------------------------------------------
+### Zlib
+
+ZLIB_LIBS=-lz
+AC_SUBST(ZLIB_LIBS)
+
+oLIBS="$LIBS"
+LIBS="$LIBS $ZLIB_LIBS"
+AC_CHECK_LIB(z, gzopen, [:], [
+  AC_MSG_ERROR([zlib is required for GnuCash])
+])
+LIBS="$oLIBS"
+
+### --------------------------------------------------------------------------
 ### QOF, the Query Object Framework.  Check if there is a native version.
 
 dnl XXX: FIXME: RELEASE HACK

Modified: gnucash/branches/2.2/src/backend/file/Makefile.am
===================================================================
--- gnucash/branches/2.2/src/backend/file/Makefile.am	2008-11-27 11:18:33 UTC (rev 17739)
+++ gnucash/branches/2.2/src/backend/file/Makefile.am	2008-11-27 11:57:27 UTC (rev 17740)
@@ -59,14 +59,14 @@
   sixtp-utils.h
 
 libgnc_backend_file_utils_la_LIBADD = \
-   ${GLIB_LIBS} ${GCONF_LIBS} ${LIBXML2_LIBS} \
+   ${GLIB_LIBS} ${GCONF_LIBS} ${LIBXML2_LIBS} ${ZLIB_LIBS} \
    ${top_builddir}/src/engine/libgncmod-engine.la \
    ${top_builddir}/src/core-utils/libgnc-core-utils.la \
    ${QOF_LIBS}
 
 libgncmod_backend_file_la_LDFLAGS = -module -avoid-version
 libgncmod_backend_file_la_LIBADD = \
-   ${GLIB_LIBS} ${GCONF_LIBS} ${LIBXML2_LIBS} \
+   ${GLIB_LIBS} ${GCONF_LIBS} ${LIBXML2_LIBS} ${ZLIB_LIBS} \
    ${top_builddir}/src/engine/libgncmod-engine.la \
    ${top_builddir}/src/core-utils/libgnc-core-utils.la \
    libgnc-backend-file-utils.la \



More information about the gnucash-changes mailing list