* Began making some build changes for Cygwin compatibility

[citadel.git] / citadel / configure.ac

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 79e5cb3fc4050d2be834c85b27024f206487e8b2..2594773e8e3694b41ee47a2a543120d912f088c6 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
 AC_PREREQ(2.52)
-AC_INIT([Citadel/UX], [5.91], [http://uncensored.citadel.org/])
+AC_INIT([Citadel/UX], [6.02], [http://uncensored.citadel.org/])
 AC_REVISION([$Revision$])
 AC_CONFIG_SRCDIR([citserver.c])
 AC_PREFIX_DEFAULT(/usr/local/citadel)
@@ -74,6 +74,10 @@ case "$host" in
        *-*-bsdi*)
                AC_DEFINE(HAVE_NONREENTRANT_NETDB)
        ;;
+       dnl Curses support on Mac OS X is kind of screwed at the moment.
+       *-*-darwin*)
+               AC_DEFINE(DISABLE_CURSES)
+       ;;
        dnl Digital Unix has an odd way to build for pthreads, and we can't
        dnl build pthreads programs with gcc due to header problems.
        alpha*-dec-osf*)
@@ -116,11 +120,7 @@ if test "$GCC" = yes; then
                ;;
        esac
 fi
-AC_LIBTOOL_DLOPEN
-AC_LIBTOOL_WIN32_DLL
 AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-AC_SUBST(LIBTOOL_DEPS)
 AC_PROG_INSTALL
 AC_PROG_YACC
 missing_dir=`cd $ac_aux_dir && pwd`
@@ -141,7 +141,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 dlopen gethostbyname connect)
+AC_CHECK_FUNCS(crypt gethostbyname connect)
 
 if test "$ac_cv_func_gethostbyname" = no; then
        AC_CHECK_LIB(nsl, gethostbyname)
@@ -151,14 +151,6 @@ if test "$ac_cv_func_connect" = no; then
         AC_CHECK_LIB(socket, connect)
 fi
 
-if test "$ac_cv_func_dlopen" = no; then
-        AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl $LIBS"
-               test "$with_pam" = yes && chkpwd_LIBS="-ldl $chkpwd_LIBS"])
-fi
-
-dnl Check for HP/UX dynamic loader. This should only be in -ldld.
-AC_CHECK_LIB(dld, shl_load, LIBS="-ldld $LIBS")
-
 dnl Check for Solaris realtime support
 AC_CHECK_LIB(rt, sched_yield)
 
@@ -394,8 +386,31 @@ if test "x$with_libical" != xno ; then
 fi
 
 if test "x$ok_libical" = xyes ; then
-       LIBS="-lical $LIBS"
-       AC_DEFINE(HAVE_LIBICAL)
+
+       AC_TRY_RUN(
+               [
+#include <ical.h>
+main() {
+       float v;
+       int i;
+       sscanf(ICAL_VERSION, "%f", &v);
+       printf("libical version: %0.2f\n", v);
+       v = v * 100.0;
+       i = (int) v;
+       if (i >= 24) {
+               printf("This version is ok.\n");
+               return(0);
+       }
+       printf("libical 0.24 or newer required.\n");
+       printf("Citadel will be built without calendar support.\n");
+       return(1);
+}
+               ], 
+               [
+                       LIBS="-lical $LIBS"
+                       AC_DEFINE(HAVE_LIBICAL)
+               ]
+       )
 fi
 
 
@@ -409,7 +424,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/time.h syslog.h unistd.h utmp.h utmpx.h paths.h db.h db3/db.h db4/db.h pthread.h netinet/in.h)
+AC_CHECK_HEADERS(curses.h dl.h fcntl.h limits.h malloc.h termios.h sys/ioctl.h sys/select.h sys/time.h syslog.h unistd.h utmp.h utmpx.h paths.h db.h db3/db.h db4/db.h pthread.h netinet/in.h arpa/nameser.h)
 
 dnl
 dnl need to check if this is actually compilable, sometimes there are
@@ -419,12 +434,15 @@ if test "x$with_ncurses" != xno; then
        AC_CHECK_HEADERS(ncurses.h,,,[ ])
 fi
 
-AC_CHECK_HEADER(resolv.h, [SMTP=modules/libsmtp.la; DOMAIN=domain.c],,
+AC_CHECK_HEADER(resolv.h, [SMTP=serv_smtp.o serv_spam.o; DOMAIN=domain.c],,
 [#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
 #endif])
 
 AC_SUBST(SMTP)
@@ -496,7 +514,7 @@ 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 serv_modules"
+       test "$DATABASE" && TARGETS="client server utils"
        if test "x$enable_threaded_client" != xno; then
                AC_DEFINE(THREADED_CLIENT)
        fi
@@ -504,6 +522,42 @@ 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
+#      sleep 2
+#      month=`date | cut -f 2 -d ' '`
+#      case $month in
+#      Dec | Jan | Feb)
+#              ac_cv_weather="it's cold!"
+#              ;;
+#      Mar | Apr)
+#              ac_cv_weather="it's wet!"
+#              ;;
+#      Jul | Aug)
+#              ac_cv_weather="it's hot!"
+#              ;;
+#      Oct | Nov)
+#              ac_cv_weather="it's cool"
+#              ;;
+#      May | Jun | Sep | *)
+#              ac_cv_weather="it's fine"
+#              ;;
+#      esac
+#      ])
+
+AC_CACHE_CHECK([under the bed], ac_cv_under_the_bed, [
+       number=`date | cut -c 19`
+       case $number in
+       7)
+               ac_cv_under_the_bed="lunatics and monsters found"
+               ;;
+       *)
+               ac_cv_under_the_bed="dust bunnies found"
+               ;;
+       esac
+       ])
+
 dnl Done! Now write the Makefile and sysdep.h
 AC_SUBST(AUTH)
 AC_SUBST(CHKPWD)