X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfigure.ac;h=94ba60de5ae4ea528232e6edcd66ea9ccc1cc770;hb=ee841bbc7c5a4ebbcb2a61675a01810ed052919d;hp=109964099d96f7bd5e17ba1b1b64305e914177ea;hpb=cd49d168981fb16f0655c506244f1d39e12d1bf4;p=citadel.git

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 109964099..94ba60de5 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.20], [http://www.citadel.org/])
+AC_INIT([Citadel], [912], [http://www.citadel.org/])
 AC_REVISION([$Revision: 5108 $])
 AC_CONFIG_SRCDIR([citserver.c])
 AC_CONFIG_HEADER(sysdep.h)
@@ -261,7 +261,6 @@ AC_ARG_WITH(ssl,
 	]
 )
 AC_ARG_WITH(with_ldap, [  --with-ldap             use OpenLDAP client library])
-dnl AC_ARG_WITH(with_libdspam, [  --with-libdspam         use libdspam mail spam scanning library])
 AC_ARG_WITH(with_gc, [  --with-gc             use the Boehm-Demers-Weiser garbage collection library])
 
 if test "x$with_db" != xno -a "x$with_db" != xyes -a "$with_db"; then
@@ -414,7 +413,7 @@ dnl Checks for libraries.
 dnl We want to test for the following in libc before checking for their
 dnl respective libraries, because some systems (like Irix) have both, and the
 dnl non-libc versions may be broken.
-AC_CHECK_FUNCS(crypt gethostbyname connect flock getpwnam_r getpwuid_r getloadavg)
+AC_CHECK_FUNCS(crypt gethostbyname connect getpwnam_r getpwuid_r getloadavg)
 
 AC_CHECK_FUNCS(strftime_l uselocale gettext)
 
@@ -565,59 +564,6 @@ AC_CHECK_HEADER(libcitadel.h,
 CFLAGS="$saved_CFLAGS"
 
 
-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
-)
-
-
-
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $SERVER_LIBS"
-dnl Check for c-ares
-AC_CHECK_HEADER(ares.h,
-	[AC_CHECK_LIB(cares, ares_parse_mx_reply,
-		[
-			LIBS="-lcares $LIBS $SERVER_LIBS"
-		],
-		[
-			AC_MSG_ERROR(libc-ares was not found or is not usable.  Please install libc-ares.)
-		]
-	)],
-	[
-		AC_MSG_ERROR(ares.h was not found or is not usable.  Please install libc-ares.)
-	]
-)
-CFLAGS="$saved_CFLAGS"
-
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $SERVER_LIBS"
-dnl Check for libev
-AC_CHECK_HEADER(ev.h,
-	[AC_TRY_COMPILE([#include <math.h>
-#include <ev.h>], 
-                         [
-			 ev_cleanup abort_by_shutdown;
-			 struct ev_loop *event_base;
-			 ev_cleanup_start(event_base, &abort_by_shutdown);
-			],
-			[
-			LIBS="-lev -lm $LIBS $SERVER_LIBS"
-			],
-		[
-			AC_MSG_ERROR(libev was not found or is not usable.  Please install libev.)
-		])
-	],
-	[
-		AC_MSG_ERROR(ev.h was not found or is not usable.  Please install libev.)
-	]
-)
-CFLAGS="$saved_CFLAGS"
-
-
 # The big search for OpenSSL
 if test "$with_ssl" != "no"; then
 	saved_LIBS="$LIBS"
@@ -760,7 +706,7 @@ fi
 dnl Checks for the OpenLDAP client library.
 if test "x$with_ldap" != xno ; then
 	AC_CHECK_HEADERS(ldap.h,
-		[AC_CHECK_LIB(ldap, ldap_init,
+		[AC_CHECK_LIB(ldap, ldap_initialize,
 			[ok_ldap=yes],,
 	)])
 fi
@@ -775,21 +721,6 @@ fi
 
 
 
-dnl Checks for the libdspam mail spam scanning library.
-dnl if test "x$with_libdspam" != xno ; then
-dnl 	AC_CHECK_HEADERS(dspam/libdspam.h,
-dnl 		[AC_CHECK_LIB(dspam, dspam_init,
-dnl 			[ok_libdspam=yes],,
-dnl 	)])
-dnl fi
-dnl 
-dnl if test "x$ok_libdspam" = xyes ; then
-dnl 	SERVER_LIBS="-ldspam $SERVER_LIBS"
-dnl 	AC_DEFINE(HAVE_LIBDSPAM, [], [(unfinished) define this if you have the libdspam mail spam scanning library available])
-dnl fi
-
-
-
 dnl Checks for the Expat XML parser.
 AC_CHECK_HEADER(expat.h,
 	[AC_CHECK_LIB(expat, XML_ParserCreateNS,
@@ -1082,7 +1013,6 @@ echo ------------------------------------------------------------------------
 echo 'LDAP support:                    ' $ok_ldap
 echo 'Character set conversion support:' $ok_iconv
 echo 'Boehm-Demers-Weiser support:     ' $ok_gc
-dnl echo 'DSpam Scanning support:          ' $ok_libdspam
 echo 
 echo 'Note: if you are not using Linux, make sure you are using GNU make'
 echo '(gmake) to compile Citadel.'