X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfigure.ac;h=8401e58b0e8013a162da797390595433b7fd3413;hb=80598eb9c1cf339151a66e3bdf1b7756efdde1a2;hp=7943c3bf9ce08072c2839c6e2dda12725cdd4c8b;hpb=943f46156f8246aa15ae4e72e33d69db32f9fefb;p=citadel.git

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 7943c3bf9..8401e58b0 100644
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
-AC_INIT([Citadel], [8.00], [http://www.citadel.org/])
+AC_INIT([Citadel], [8.03], [http://www.citadel.org/])
 AC_REVISION([$Revision: 5108 $])
 AC_CONFIG_SRCDIR([citserver.c])
 AC_CONFIG_HEADER(sysdep.h)
@@ -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,
@@ -398,6 +401,8 @@ AC_SUBST(DEPEND_FLAG)
 
 AC_PROG_INSTALL
 AC_PROG_YACC
+AC_PATH_PROG(DIFF,diff)
+AC_PATH_PROG(PATCH,patch)
 missing_dir=`cd $ac_aux_dir && pwd`
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
 AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
@@ -568,28 +573,21 @@ AC_CHECK_HEADER(libcitadel.h,
 CFLAGS="$saved_CFLAGS"
 
 
-dnl experimental libev smtp client remove this to...
-AC_DEFINE(EXPERIMENTAL_SMTP_EVENT_CLIENT, [], [should we use the experimental libevent smtp client?])
-dnl here...
-
-
-
-
-                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])
-                have_good_c_ares=yes
-                  ],, $SOCKET_LIBS $NSL_LIBS
-                )
+		    AC_DEFINE(HAVE_C_ARES, 1, [Define to use c-ares library])
+                    have_good_c_ares=yes
+            ],, $SOCKET_LIBS $NSL_LIBS
+)
 
 
 
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $SERVER_LIBS"
-dnl Check for libevent
+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"
 		],
@@ -605,9 +603,9 @@ CFLAGS="$saved_CFLAGS"
 
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $SERVER_LIBS"
-dnl Check for libevent
+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"
 		],
@@ -622,6 +620,7 @@ AC_CHECK_HEADER(ev.h,
 )
 CFLAGS="$saved_CFLAGS"
 
+
 # The big search for OpenSSL
 if test "$with_ssl" != "no"; then
 	saved_LIBS="$LIBS"
@@ -1042,10 +1041,7 @@ AC_CACHE_CHECK([under the bed], ac_cv_under_the_bed, [
 
 STRUCT_UCRED
 
-
-
 dnl Done! Now write the Makefile and sysdep.h
-AC_SUBST(AUTH)
 AC_SUBST(RESOLV)
 AC_SUBST(chkpwd_LIBS)
 AC_SUBST(TARGETS)
@@ -1053,6 +1049,8 @@ AC_SUBST(DATABASE)
 AC_SUBST(SERVER_LDFLAGS)
 AC_SUBST(SERVER_LIBS)
 AC_SUBST(SETUP_LIBS)
+AC_SUBST(DIFF)
+AC_SUBST(PATCH)
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT(database_cleanup.sh po/citadel-setup/Makefile)