X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfigure.ac;h=1beae85af54da258039533d19f789323e6ba2676;hb=b7e430f56aaed85e8ba983a36c377751018a06ba;hp=bd25624195de30b8a834ecbbd1563d32c939fbf1;hpb=79caf32ef601c9f24ef0cf83c0a0c99083366d0c;p=citadel.git diff --git a/citadel/configure.ac b/citadel/configure.ac index bd2562419..1beae85af 100644 --- a/citadel/configure.ac +++ b/citadel/configure.ac @@ -1,7 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -dnl $Id$ AC_PREREQ(2.52) -AC_INIT([Citadel], [7.66], [http://www.citadel.org/]) +AC_INIT([Citadel], [8.00], [http://www.citadel.org/]) AC_REVISION([$Revision: 5108 $]) AC_CONFIG_SRCDIR([citserver.c]) AC_CONFIG_HEADER(sysdep.h) @@ -10,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. @@ -155,6 +156,19 @@ AC_ARG_WITH(docdir, ] ) +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. if test "x$with_zlib" != xno ; then @@ -165,7 +179,7 @@ if test "x$with_zlib" != xno ; then fi if test "x$ok_zlib" = xyes ; then -dnl libcitadel will bring libz, so we don't need it here. LDFLAGS="-lz $LDFLAGS" + LDFLAGS="-lz $LDFLAGS" AC_DEFINE(HAVE_ZLIB, [], [define this if you have zlib compression available]) fi @@ -248,8 +262,6 @@ AC_ARG_WITH(ssl, fi ] ) -AC_ARG_WITH(ncurses, [ --without-ncurses don't use ncurses]) - 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]) @@ -293,7 +305,6 @@ case "$host" in dnl TCP buffering isn't ideal under OS X. This define should also be dnl checked in other cases of OS X-Linux differences. *-*-darwin*) - AC_DEFINE(DISABLE_CURSES,[],[define this to disable use of curses]) AC_DEFINE(HAVE_DARWIN, [], [define if using OS X/Darwin]) AC_MSG_RESULT([Mac OS X]) ;; @@ -406,8 +417,32 @@ 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) +AC_CHECK_FUNCS(crypt gethostbyname connect flock getpwnam_r getpwuid_r getloadavg) +AC_CHECK_FUNCS(strftime_l uselocale gettext) + +if test "$ok_nls" != "no"; then + AC_CHECK_PROG(ok_xgettext, xgettext, yes, no) + ok_nls=$ok_xgettext +fi + +if test "$ok_nls" != "no"; then + AC_CHECK_PROG(ok_msgmerge, msgmerge, yes, no) + ok_nls=$ok_msgmerge +fi + +if test "$ok_nls" != "no"; then + AC_CHECK_PROG(ok_msgfmt, msgfmt, yes, no) + ok_nls=$ok_msgfmt +fi + +if test "$ok_nls" != "no"; then + 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/citadel-setup" +else + AC_MSG_RESULT(citadel will be built without national language support.) +fi dnl disable backtrace if we don't want it. AC_ARG_WITH(backtrace, @@ -477,14 +512,6 @@ test "$enable_chkpwd" != no && LIBS=$save_LIBS fi fi -if test "x$with_ncurses" != "xno"; then - AC_SEARCH_LIBS(tgetent, [ncurses curses termcap]) - AC_SEARCH_LIBS(scrollok, [ncurses curses]) - AC_SEARCH_LIBS(initscr, [ncurses curses]) -else - AC_SEARCH_LIBS(tgetent, [curses termcap]) - AC_SEARCH_LIBS(initscr, [curses]) -fi AC_CHECK_FUNCS(vw_printw wcolor_set resizeterm wresize) dnl Check for libpthread(s) if we're not using Digital UNIX or FreeBSD. (On @@ -551,6 +578,59 @@ AC_CHECK_HEADER(libcitadel.h, CFLAGS="$saved_CFLAGS" +dnl experimental libev smtp client remove this to... +AC_DEFINE(EXPERIMENTAL_SMTP_EVENT_CLIENT, [], [should we use the experimental libevent smtp client?]) +dnl here... + + + + + AC_CHECK_LIB(cares, ares_init, + [ + 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 libevent +AC_CHECK_HEADER(ares.h, + [AC_CHECK_LIB(cares, ares_init, + [ + 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 libevent +AC_CHECK_HEADER(ev.h, + [AC_CHECK_LIB(ev, libcitadel_version_string, + [ + 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 @@ -710,7 +790,7 @@ fi dnl Checks for the Boehm-Demers-Weiser garbage collection library. if test "x$with_gc" != xno ; then - AC_CHECK_HEADERS(gc/gc.h, + AC_CHECK_HEADERS(gc/gc_local_alloc.h, [AC_CHECK_LIB(gc, GC_init, [ok_gc=yes],, )]) @@ -796,15 +876,7 @@ dnl dnl TODO: for the DB header checks, we should check whether the headers dnl define db_env_create, somehow dnl -AC_CHECK_HEADERS(curses.h dl.h fcntl.h limits.h malloc.h termios.h sys/ioctl.h sys/select.h sys/stat.h sys/time.h sys/prctl.h syslog.h unistd.h utmp.h utmpx.h paths.h db.h db4/db.h pthread.h netinet/in.h arpa/nameser.h arpa/nameser_compat.h) - -dnl -dnl need to check if this is actually compilable, sometimes there are -dnl conflicts with the system's headers (eg solaris xpg4 style headers) -dnl -if test "x$with_ncurses" != xno; then - AC_CHECK_HEADERS(ncurses.h,,,[ ]) -fi +AC_CHECK_HEADERS(dl.h fcntl.h limits.h malloc.h termios.h sys/ioctl.h sys/select.h sys/stat.h sys/time.h sys/prctl.h syslog.h unistd.h utmp.h utmpx.h paths.h db.h db4/db.h pthread.h netinet/in.h arpa/nameser.h arpa/nameser_compat.h syscall.h sys/syscall.h) AC_CHECK_HEADER(resolv.h,AC_DEFINE(HAVE_RESOLV_H, [], [define this if you have the resolv.h header file.]),, [#ifdef HAVE_SYS_TYPES_H @@ -1008,7 +1080,7 @@ AC_SUBST(SERVER_LDFLAGS) AC_SUBST(SERVER_LIBS) AC_SUBST(SETUP_LIBS) AC_CONFIG_FILES([Makefile]) -AC_OUTPUT(database_cleanup.sh) +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.])