X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfigure.ac;h=3a4fbe69ca56830c64c92ef77fe96a0b882d9ecc;hb=a845b4fa9330e996a5cc62fdc5347ac982e855bf;hp=1758a77fce404290bb82fbd3087a3e900ef3d480;hpb=59a81237c1365b9c7643cff7511a805f5679ed4f;p=citadel.git

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 1758a77fc..3a4fbe69c 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.03], [http://www.citadel.org/])
+AC_INIT([Citadel], [9.01], [http://www.citadel.org/])
 AC_REVISION([$Revision: 5108 $])
 AC_CONFIG_SRCDIR([citserver.c])
 AC_CONFIG_HEADER(sysdep.h)
@@ -247,11 +247,6 @@ fi
 
 AC_CHECK_LIB(intl, libintl_bindtextdomain, [LDFLAGS="$LDFLAGS -lintl"])
 
-
-
-AC_ARG_ENABLE(threaded-client, [  --disable-threaded-client
-			  disable multithreaded client])
-
 AC_ARG_ENABLE(pie, [  --enable-pie            build position-independent executables])
 
 AC_ARG_WITH(pam, [  --with-pam              use PAM if present (see PAM.txt before you try this)])
@@ -284,10 +279,6 @@ else
 	test -d /usr/local/BerkeleyDB.4.5 && db_dir=/usr/local/BerkeleyDB.4.5
 fi
 
-dnl By default, we only build the client (citadel and whobbs) unless we can
-dnl figure out how to build with POSIX threads.
-TARGETS=client
-
 AC_CANONICAL_HOST
 PTHREAD_DEFS=-D_REENTRANT
 AC_MSG_CHECKING([how to compile with POSIX threads])
@@ -415,6 +406,7 @@ AC_CHECK_SIZEOF(short, 0)
 AC_CHECK_SIZEOF(int, 0)
 AC_CHECK_SIZEOF(long, 0)
 AC_CHECK_SIZEOF(size_t, 0)
+AC_CHECK_SIZEOF(loff_t, 0)
 dnl AC_CHECK_SIZEOF(long long, 0)
 
 dnl Checks for libraries.
@@ -611,7 +603,10 @@ AC_CHECK_HEADER(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.)
 		])
@@ -623,23 +618,6 @@ AC_CHECK_HEADER(ev.h,
 CFLAGS="$saved_CFLAGS"
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 # The big search for OpenSSL
 if test "$with_ssl" != "no"; then
 	saved_LIBS="$LIBS"
@@ -782,7 +760,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
@@ -1010,14 +988,9 @@ AC_CACHE_CHECK([for pthread_create], ac_cv_func_pthread_create,
 #endif],
 ac_cv_func_pthread_create=yes, ac_cv_func_pthread_create=no)])
 if test "$ac_cv_func_pthread_create" = yes; then
-	test "$DATABASE" && TARGETS="client server utils"
-	if test "x$enable_threaded_client" != xno; then
-		AC_DEFINE(THREADED_CLIENT, [], [define this if you want to enable the multithreaded client])
-	fi
+	test "$DATABASE" && TARGETS="server utils"
 fi
 
-AC_REPLACE_FUNCS(snprintf getutline)
-
 AC_CACHE_CHECK([the weather], ac_cv_weather, [
 	sleep 1
 	echo $ECHO_N "opening your window... $ECHO_C" >&6
@@ -1098,7 +1071,6 @@ if test "$abs_srcdir" != "$abs_builddir"; then
    fi
    mkdir -p $abs_builddir/utils
    mkdir -p $abs_builddir/utillib
-   mkdir -p $abs_builddir/textclient
 fi
 
 if test -n "$srcdir"; then