X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfigure.ac;h=7682cbb4024fb5665df49cf770dc06c25088640f;hb=452067d76c1c0a1824321394db4af2c4f1438af0;hp=ce871bf7d17a071cd1e4649e66bc62c918934575;hpb=28a470b26419c29e20eb9b1e24acbdeb542bca75;p=citadel.git diff --git a/citadel/configure.ac b/citadel/configure.ac index ce871bf7d..7682cbb40 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], [8.12], [http://www.citadel.org/]) AC_REVISION([$Revision: 5108 $]) AC_CONFIG_SRCDIR([citserver.c]) AC_CONFIG_HEADER(sysdep.h) @@ -9,9 +9,11 @@ AC_PREFIX_DEFAULT(/usr/local/citadel) if test "$prefix" = NONE; then AC_DEFINE_UNQUOTED(CTDLDIR, "$ac_default_prefix", [define this to the Citadel home directory]) ssl_dir="$ac_default_prefix/keys" + localedir=$ac_default_prefix else AC_DEFINE_UNQUOTED(CTDLDIR, "$prefix", [define this to the Citadel home directory]) ssl_dir="$prefix/keys" + localedir=$prefix fi dnl Make sure we see all GNU and Solaris extensions. @@ -154,22 +156,38 @@ AC_ARG_WITH(docdir, ] ) - -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 +dnl where to put the locale files +AC_ARG_WITH(localedir, + [ --with-localedir directory to put the locale files to], + [ if test "x$withval" != "xno" ; then + localedir=$withval + fi + ] +) +AC_DEFINE_UNQUOTED(LOCALEDIR, "$localedir",[where to find our pot files]) +LOCALEDIR=$localedir +AC_SUBST(LOCALEDIR) +dnl Checks for the zlib compression library. +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, @@ -352,7 +370,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 @@ -383,6 +401,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) @@ -422,11 +442,11 @@ if test "$ok_nls" != "no"; then fi if test "$ok_nls" != "no"; then - AC_MSG_RESULT(WebCit will be built with national language support.) + AC_MSG_RESULT(citadel will be built with national language support.) AC_DEFINE(ENABLE_NLS, [], [whether we have NLS support]) - PROG_SUBDIRS="$PROG_SUBDIRS po" + PROG_SUBDIRS="$PROG_SUBDIRS po/citadel-setup" else - AC_MSG_RESULT(WebCit will be built without national language support.) + AC_MSG_RESULT(citadel will be built without national language support.) fi dnl disable backtrace if we don't want it. @@ -452,16 +472,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 @@ -563,6 +573,58 @@ 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 +#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.) + ] +) +CFLAGS="$saved_CFLAGS" + # The big search for OpenSSL if test "$with_ssl" != "no"; then @@ -720,22 +782,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 @@ -1000,10 +1046,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) @@ -1011,8 +1054,10 @@ 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/Makefile) +AC_OUTPUT(database_cleanup.sh po/citadel-setup/Makefile) if test -z "$DATABASE"; then AC_MSG_WARN([No database driver was found. Please install Berkeley DB.])