From: Wilfried Göesgens <willi@citadel.org>
Date: Sat, 13 Dec 2008 22:36:33 +0000 (+0000)
Subject: * link libz if we detect it.
X-Git-Tag: v7.86~1711
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=736ef4625c5fb284854901fb33c3306dc2c669fc

* link libz if we detect it.
---

diff --git a/libcitadel/Makefile.in b/libcitadel/Makefile.in
index f18a1e43e..0d80c40e0 100755
--- a/libcitadel/Makefile.in
+++ b/libcitadel/Makefile.in
@@ -24,6 +24,7 @@ top_builddir = .
 pkgconfig_DATA = libcitadel.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
+
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -85,7 +86,7 @@ CXX = @CXX@
 LIBTOOL = @LIBTOOL@
 
 INCLUDES = -I$(srcdir)/lib -I.
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ @LIBS@
 CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@
 CXXFLAGS = @CXXFLAGS@
diff --git a/libcitadel/configure.in b/libcitadel/configure.in
index b70532b8e..8d8e27490 100755
--- a/libcitadel/configure.in
+++ b/libcitadel/configure.in
@@ -149,6 +149,7 @@ fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 
+AC_SUBST(LIBS)
 AC_C_CONST
 AC_TYPE_SIZE_T
 AC_CHECK_FUNCS(memmove bcopy)
diff --git a/libcitadel/debian/files b/libcitadel/debian/files
index 73fc3064e..d2ac0561c 100644
--- a/libcitadel/debian/files
+++ b/libcitadel/debian/files
@@ -1,3 +1,3 @@
-libcitadel1_7.38-8_amd64.deb libs optional
-libcitadel1-dbg_7.38-8_amd64.deb libdevel optional
-libcitadel-dev_7.38-8_amd64.deb libdevel optional
+libcitadel1_7.38-8_i386.deb libs optional
+libcitadel1-dbg_7.38-8_i386.deb libdevel optional
+libcitadel-dev_7.38-8_i386.deb libdevel optional
diff --git a/libcitadel/debian/libcitadel1.substvars b/libcitadel/debian/libcitadel1.substvars
index 36e5a58f3..d8fed07b5 100644
--- a/libcitadel/debian/libcitadel1.substvars
+++ b/libcitadel/debian/libcitadel1.substvars
@@ -1 +1 @@
-shlibs:Depends=libc6 (>= 2.7-1)
+shlibs:Depends=libc6 (>= 2.7-1), zlib1g (>= 1:1.1.4)