* detect zlib, don't link it. libcitadel does this for us.

diff --git a/citadel/configure.ac b/citadel/configure.ac
index f6c780b47a5d03311dae9fddfbf4817717821e10..8d0ed34c481d06ed81254faf79d1781d97e20d4c 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -142,6 +142,22 @@ AC_ARG_WITH(docdir,
 )
 
 
+dnl Checks for the zlib compression library.
+if test "x$with_zlib" != xno ; then
+       AC_CHECK_HEADERS(zlib.h,
+               [AC_CHECK_LIB(z, zlibVersion,
+                       [ok_zlib=yes],,
+       )])
+fi
+
+if test "x$ok_zlib" = xyes ; then
+dnl  libcitadel will bring libz, so we don't need it here.     LDFLAGS="-lz $LDFLAGS" 
+       AC_DEFINE(HAVE_ZLIB, [], [define this if you have zlib compression available])
+fi
+
+
+
+
 dnl Here is the check for a libc integrated iconv
 AC_ARG_ENABLE(iconv,
        [  --disable-iconv         do not use iconv charset conversion],

diff --git a/citadel/debian/control b/citadel/debian/control
index 9967389093eee9f8674b894de0bee6ba52fda53b..4e9b3785f9112278ac781f008a62bdb4ff30400c 100644 (file)
--- a/citadel/debian/control
+++ b/citadel/debian/control
@@ -5,7 +5,7 @@ Maintainer: Wilfried Goesgens <w.goesgens@outgesourced.org>
 Build-Depends: debhelper (>= 4), po-debconf, bison, autotools-dev,
  libdb4.4-dev | libdb4.3-dev, libical-dev, libldap2-dev, libncurses5-dev,
  libpam0g-dev, libsieve2-dev, libssl-dev, libexpat1-dev, libcitadel-dev,
- libcurl4-openssl-dev | libcurl3-openssl-dev
+ libcurl4-openssl-dev | libcurl3-openssl-dev, zlib1g-dev
 Standards-Version: 3.7.3
 
 Package: citadel-server