X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfigure.ac;h=f6b7515f572e4df2ce876d46c169ed6d847d583f;hb=0e679ba8cf047ca0b277421eb7872069cf04b640;hp=baa179e45421d06cfde066793b9fc4d69c7b3836;hpb=fdb030b497950239b2b7db63b3953f6a6f425f1e;p=citadel.git diff --git a/citadel/configure.ac b/citadel/configure.ac index baa179e45..f6b7515f5 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], [7.89], [http://www.citadel.org/]) +AC_INIT([Citadel], [902], [http://www.citadel.org/]) AC_REVISION([$Revision: 5108 $]) AC_CONFIG_SRCDIR([citserver.c]) AC_CONFIG_HEADER(sysdep.h) @@ -171,20 +171,23 @@ AC_SUBST(LOCALEDIR) dnl Checks for the zlib compression library. -if test "x$with_zlib" != xno ; then - AC_CHECK_HEADERS(zlib.h, - [AC_CHECK_LIB(z, zlibVersion, - [ok_zlib=yes],, - )]) -fi - -if test "x$ok_zlib" = xyes ; then - LDFLAGS="-lz $LDFLAGS" - AC_DEFINE(HAVE_ZLIB, [], [define this if you have zlib compression available]) -fi - - - +saved_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $SERVER_LIBS" +AC_CHECK_HEADER(zlib.h, + [AC_CHECK_LIB(z, zlibVersion, + [ + LIBS="-lz $LIBS $SERVER_LIBS" + ], + [ + AC_MSG_ERROR(zlib was not found or is not usable. Please install zlib.) + ] + , + )], + [ + AC_MSG_ERROR(zlib.h was not found or is not usable. Please install zlib.) + ] +) +CFLAGS="$saved_CFLAGS" dnl Here is the check for a libc integrated iconv AC_ARG_ENABLE(iconv, @@ -244,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)]) @@ -281,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]) @@ -367,7 +361,7 @@ if test "$GCC" = yes; then CFLAGS="$CFLAGS -Wall -Wcast-qual -Wcast-align -Wno-char-subscripts $PTHREAD_DEFS" ;; *) - CFLAGS="$CFLAGS -Wall -Wcast-qual -Wcast-align -Wstrict-prototypes $PTHREAD_DEFS" + CFLAGS="$CFLAGS -Wall -Wcast-qual -Wcast-align -Wstrict-prototypes -Wno-strict-aliasing $PTHREAD_DEFS" ;; esac fi @@ -398,6 +392,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) @@ -410,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. @@ -417,7 +414,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) @@ -467,16 +464,6 @@ AC_ARG_WITH(gprof, ] ) -dnl disable thread table reporting -AC_ARG_WITH(threadlog, - [ --with-threadlog enable logging of thread table], - [ if test "x$withval" != "xno" ; then - AC_DEFINE(WITH_THREADLOG, [], [Define if you want logging of the thread tables.]) - fi - ] -) - - if test "$ac_cv_func_gethostbyname" = no; then AC_CHECK_LIB(nsl, gethostbyname) fi @@ -578,40 +565,58 @@ AC_CHECK_HEADER(libcitadel.h, CFLAGS="$saved_CFLAGS" -dnl experimental libevent smtp client remove this to... -AC_ARG_WITH(experimental_eventsmtp, - [ --with-experimental_eventsmtp enable experimental event smtp clients], - [ if test "x$withval" != "xno" ; then - CFLAGS="$CFLAGS -rdynamic " - LDFLAGS="$LDFLAGS -rdynamic " - SERVER_LDFLAGS="$SERVER_LDFLAGS -rdynamic " +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(EXPERIMENTAL_SMTP_EVENT_CLIENT, [], [should we use the experimental libevent smtp client?]) -dnl here... saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $SERVER_LIBS" -dnl Check for libevent -AC_CHECK_HEADER(event.h, - [AC_CHECK_LIB(event, libcitadel_version_string, +dnl Check for c-ares +AC_CHECK_HEADER(ares.h, + [AC_CHECK_LIB(cares, ares_parse_mx_reply, [ - LIBS="-levent $LIBS $SERVER_LIBS" + LIBS="-lcares $LIBS $SERVER_LIBS" ], [ - AC_MSG_ERROR(libevent was not found or is not usable. Please install libevent.) + AC_MSG_ERROR(libc-ares was not found or is not usable. Please install libc-ares.) ] - , )], [ - AC_MSG_ERROR(event.h was not found or is not usable. Please install libevent.) + AC_MSG_ERROR(ares.h was not found or is not usable. Please install libc-ares.) ] ) - CFLAGS="$saved_CFLAGS" -dnl and from here to... - fi - ] + +saved_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $SERVER_LIBS" +dnl Check for libev +AC_CHECK_HEADER(ev.h, + [AC_TRY_COMPILE([#include +#include ], + [ + 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.) + ] ) -dnl here to make it final. +CFLAGS="$saved_CFLAGS" + # The big search for OpenSSL if test "$with_ssl" != "no"; then @@ -755,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 @@ -769,22 +774,6 @@ fi -dnl Checks for the Boehm-Demers-Weiser garbage collection library. -if test "x$with_gc" != xno ; then - AC_CHECK_HEADERS(gc/gc_local_alloc.h, - [AC_CHECK_LIB(gc, GC_init, - [ok_gc=yes],, - )]) -fi - -if test "x$ok_gc" = xyes ; then - SERVER_LIBS="-lgc $SERVER_LIBS" - AC_DEFINE(HAVE_GC, [], [define this if you have Boehm-Demers-Weiser available]) -fi - - - - dnl Checks for the libdspam mail spam scanning library. dnl if test "x$with_libdspam" != xno ; then @@ -999,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 @@ -1049,10 +1033,7 @@ AC_CACHE_CHECK([under the bed], ac_cv_under_the_bed, [ STRUCT_UCRED - - dnl Done! Now write the Makefile and sysdep.h -AC_SUBST(AUTH) AC_SUBST(RESOLV) AC_SUBST(chkpwd_LIBS) AC_SUBST(TARGETS) @@ -1060,6 +1041,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) @@ -1088,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