X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfigure.ac;h=1db8cbf161c20b85493bc96deec8ca5ab408b1a1;hb=3b838158360ccde6f1f5a03a571879c7e27b508d;hp=a4140b822558275a7f1e07891ad9f689a60771ac;hpb=66f72c07b70ed9500c49e8ff3c3f895e5269d339;p=citadel.git diff --git a/citadel/configure.ac b/citadel/configure.ac index a4140b822..1db8cbf16 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], [901], [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. @@ -768,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 @@ -996,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 @@ -1084,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