zlib is now mandatory.

[citadel.git] / citadel / configure.ac

diff --git a/citadel/configure.ac b/citadel/configure.ac
index b5ba642550a9abe8742b9b045aaecfccc45a714c..8401e58b0e8013a162da797390595433b7fd3413 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -171,20 +171,23 @@ AC_SUBST(LOCALEDIR)
 
 
 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
-       LDFLAGS="-lz $LDFLAGS" 
-       AC_DEFINE(HAVE_ZLIB, [], [define this if you have zlib compression available])
-fi
-
-
-
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $SERVER_LIBS"
+AC_CHECK_HEADER(zlib.h,
+       [AC_CHECK_LIB(z, zlibVersion,
+               [
+                       LIBS="-lz $LIBS $SERVER_LIBS"
+               ],
+               [
+                       AC_MSG_ERROR(zlib was not found or is not usable.  Please install zlib.)
+               ]
+       ,
+       )],
+       [
+               AC_MSG_ERROR(zlib.h was not found or is not usable.  Please install zlib.)
+       ]
+)
+CFLAGS="$saved_CFLAGS"
 
 dnl Here is the check for a libc integrated iconv
 AC_ARG_ENABLE(iconv,
@@ -570,7 +573,7 @@ AC_CHECK_HEADER(libcitadel.h,
 CFLAGS="$saved_CFLAGS"
 
 
-AC_CHECK_LIB(cares, ares_init,
+AC_CHECK_LIB(cares, ares_parse_mx_reply,
             [
                     C_ARES_LIBS=-lcares
                    AC_DEFINE(HAVE_C_ARES, 1, [Define to use c-ares library])
@@ -584,7 +587,7 @@ saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $SERVER_LIBS"
 dnl Check for c-ares
 AC_CHECK_HEADER(ares.h,
-       [AC_CHECK_LIB(cares, ares_init,
+       [AC_CHECK_LIB(cares, ares_parse_mx_reply,
                [
                        LIBS="-lcares $LIBS $SERVER_LIBS"
                ],
@@ -602,7 +605,7 @@ saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $SERVER_LIBS"
 dnl Check for libev
 AC_CHECK_HEADER(ev.h,
-       [AC_CHECK_LIB(ev, libcitadel_version_string,
+       [AC_CHECK_LIB(ev, ev_cleanup_start,
                [
                        LIBS="-lev -lm $LIBS $SERVER_LIBS"
                ],
@@ -617,25 +620,6 @@ AC_CHECK_HEADER(ev.h,
 )
 CFLAGS="$saved_CFLAGS"
 
-AC_MSG_CHECKING(Checking version of libev)
-AC_TRY_RUN([
-       #include <ev.h>
-       main() {
-               printf("libev is version %d.%d\n", ev_version_major(), ev_version_minor());
-               if (ev_version_major() >= 4) {
-                       exit(0);
-               }
-               exit(1);
-       }
- ],
-               [
-                       AC_MSG_RESULT(This will do just fine, thank you)
-               ],
-               [ 
-                       AC_MSG_ERROR(Citadel requires a newer version of libev.  More info: http://www.citadel.org/doku.php/installation:start)
-               ]
-)
-
 
 # The big search for OpenSSL
 if test "$with_ssl" != "no"; then