X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfigure.ac;h=dbe59677ed1dc840567f862ab8c392bd2bcb3bf4;hb=97a1a0d3086fd9a7e52f05687eb039e6ef7a5c79;hp=e29bbea0cea0e06bbd0f0868644e1c2296ccbb1a;hpb=7716f155f4145d83b6acfe6157599e6a9ee04608;p=citadel.git diff --git a/citadel/configure.ac b/citadel/configure.ac index e29bbea0c..dbe59677e 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.00], [http://www.citadel.org/]) +AC_INIT([Citadel], [8.01], [http://www.citadel.org/]) AC_REVISION([$Revision: 5108 $]) AC_CONFIG_SRCDIR([citserver.c]) AC_CONFIG_HEADER(sysdep.h) @@ -367,7 +367,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 +398,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) @@ -467,16 +469,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,20 +570,13 @@ 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, - [ +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 - ) + AC_DEFINE(HAVE_C_ARES, 1, [Define to use c-ares library]) + have_good_c_ares=yes + ],, $SOCKET_LIBS $NSL_LIBS +) @@ -1052,10 +1037,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) @@ -1063,6 +1045,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)