autoconf check for ev_cleanup_start() instead of a test program

[citadel.git] / citadel / configure.ac

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 12d054fa28d053f58fac22932901b85d59744f4f..4e0982cbe018a3283d9bb5e527bb777bb31d51e2 100644 (file)
--- 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)
@@ -398,6 +398,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,7 +570,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])
@@ -580,9 +582,9 @@ AC_CHECK_LIB(cares, ares_init,
 
 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"
                ],
@@ -598,9 +600,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"
                ],
@@ -615,6 +617,7 @@ AC_CHECK_HEADER(ev.h,
 )
 CFLAGS="$saved_CFLAGS"
 
+
 # The big search for OpenSSL
 if test "$with_ssl" != "no"; then
        saved_LIBS="$LIBS"
@@ -1035,8 +1038,6 @@ AC_CACHE_CHECK([under the bed], ac_cv_under_the_bed, [
 
 STRUCT_UCRED
 
-
-
 dnl Done! Now write the Makefile and sysdep.h
 AC_SUBST(RESOLV)
 AC_SUBST(chkpwd_LIBS)
@@ -1045,6 +1046,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)