From e6ddb8126c3c0f63f9efdaeaa4e9056faa02f441 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Sat, 13 Dec 2008 22:37:50 +0000
Subject: [PATCH] * remove libz crap, libcitadel does this now.

---
 webcit/configure.ac | 40 +++++++++++++---------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/webcit/configure.ac b/webcit/configure.ac
index fa8de7976..e2ac5e7f1 100644
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -160,56 +160,43 @@ fi
 
 AC_CHECK_LIB(intl, libintl_bindtextdomain, [LDFLAGS="$LDFLAGS -lintl"])
 
-dnl Checks for the zlib compression library.
-AC_ARG_WITH(with_zlib,    [  --with-zlib             use zlib compression if present])
-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
-        LIBS="-lz $LIBS"
-        AC_DEFINE(HAVE_ZLIB,[],[whether we have zlib])
-fi
-
 
-dnl Check for libcitadel
-AC_CHECK_HEADER(libcitadel.h,
-	[AC_CHECK_LIB(citadel, libcitadel_version_string,
+dnl Checks for the libical iCalendar library.
+AC_CHECK_HEADER(libical/ical.h,
+	[AC_CHECK_LIB(ical, icaltimezone_set_tzid_prefix,
 		[
-			LIBS="-lcitadel $LIBS"
+			LIBS="-lical $LIBS"
 		],
 		[
-			AC_MSG_ERROR(libcitadel was not found or is not usable.  Please install libcitadel.)
+			AC_MSG_ERROR(libical was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
 		]
 	,
 	)],
 	[
-		AC_MSG_ERROR(libcitadel.h was not found or is not usable.  Please install libcitadel.)
+		AC_MSG_ERROR(libical/ical.h was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
 	]
 )
 
 
-dnl Checks for the libical iCalendar library.
-AC_CHECK_HEADER(libical/ical.h,
-	[AC_CHECK_LIB(ical, icaltimezone_set_tzid_prefix,
+dnl Check for libcitadel
+AC_CHECK_HEADER(libcitadel.h,
+	[AC_CHECK_LIB(citadel, libcitadel_version_string,
 		[
-			LIBS="-lical $LIBS"
+			LIBS="-lcitadel $LIBS"
 		],
 		[
-			AC_MSG_ERROR(libical was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
+			AC_MSG_ERROR(libcitadel was not found or is not usable.  Please install libcitadel.)
 		]
 	,
 	)],
 	[
-		AC_MSG_ERROR(libical/ical.h was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
+		AC_MSG_ERROR(libcitadel.h was not found or is not usable.  Please install libcitadel.)
 	]
 )
 
 
 
+
 # The big search for OpenSSL
 if test "$with_ssl" != "no"; then
 	saved_LIBS="$LIBS"
@@ -461,7 +448,6 @@ AC_CONFIG_HEADER(sysdep.h)
 AC_OUTPUT(Makefile po/Makefile )
 
 echo ------------------------------------------------------------------------
-echo 'zlib compression:                ' $ok_zlib
 echo 'Character set conversion support:' $ok_iconv
 echo 'National language support:       ' $ok_nls
 echo 
-- 
2.30.2