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)
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)
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"
],
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"
],
)
CFLAGS="$saved_CFLAGS"
+
# The big search for OpenSSL
if test "$with_ssl" != "no"; then
saved_LIBS="$LIBS"
STRUCT_UCRED
-
-
dnl Done! Now write the Makefile and sysdep.h
AC_SUBST(RESOLV)
AC_SUBST(chkpwd_LIBS)
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)