X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfigure.ac;h=52241a1d129f691a3054be346ef8c3e982214f3d;hb=c08adcea52e85d6139ad158c17eb3d1941df2eb5;hp=fefd6b1c224b3f111656b4ebbd46a1b9cd032994;hpb=b34a965d2335754fe95f4577f3bbc574e4a03160;p=citadel.git

diff --git a/citadel/configure.ac b/citadel/configure.ac
index fefd6b1c2..52241a1d1 100644
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -1,19 +1,20 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
 AC_PREREQ(2.52)
-AC_INIT([Citadel], [7.05], [http://www.citadel.org/])
-AC_REVISION([$Revision$])
+AC_INIT([Citadel], [7.86], [http://www.citadel.org/])
+AC_REVISION([$Revision: 5108 $])
 AC_CONFIG_SRCDIR([citserver.c])
+AC_CONFIG_HEADER(sysdep.h)
+AC_CONFIG_MACRO_DIR([m4])
 AC_PREFIX_DEFAULT(/usr/local/citadel)
 if test "$prefix" = NONE; then
-	AC_DEFINE_UNQUOTED(CTDLDIR, "$ac_default_prefix")
+	AC_DEFINE_UNQUOTED(CTDLDIR, "$ac_default_prefix", [define this to the Citadel home directory])
 	ssl_dir="$ac_default_prefix/keys"
 else
-	AC_DEFINE_UNQUOTED(CTDLDIR, "$prefix")
+	AC_DEFINE_UNQUOTED(CTDLDIR, "$prefix", [define this to the Citadel home directory])
 	ssl_dir="$prefix/keys"
 fi
 
-
 dnl Make sure we see all GNU and Solaris extensions.
 AC_GNU_SOURCE
 
@@ -22,10 +23,35 @@ dnl Checks for the Datadir
 AC_ARG_WITH(datadir, 
 		    [  --with-datadir          directory to store the databases under],
 			[ if test "x$withval" != "xno" ; then
-					      AC_DEFINE(HAVE_DATA_DIR)
-						  AC_DEFINE_UNQUOTED(DATA_DIR, "$withval")
-						  MAKE_DATA_DIR=$withval
-						  AC_SUBST(MAKE_DATA_DIR)
+					      AC_DEFINE(HAVE_DATA_DIR,[],[use alternate database location?])
+					      AC_DEFINE_UNQUOTED(DATA_DIR, "$withval",[define, if the user suplied a data-directory to use.])
+					      MAKE_DATA_DIR=$withval
+					      AC_SUBST(MAKE_DATA_DIR)
+			  fi
+			]
+)
+
+
+dnl Checks for the helpDatadir
+AC_ARG_WITH(helpdir, 
+		    [  --with-helpdir          directory to store the helpfiles under],
+			[ if test "x$withval" != "xno" ; then
+					      AC_DEFINE(HAVE_HELP_DIR,[],[use alternate database location?])
+					      AC_DEFINE_UNQUOTED(HELP_DIR, "$withval",[define, if the user suplied a helpfile-directory to use.])
+					      MAKE_HELP_DIR=$withval
+					      AC_SUBST(MAKE_HELP_DIR)
+			  fi
+			]
+)
+
+dnl Checks for the Static Datadir
+AC_ARG_WITH(staticdatadir, 
+		    [  --with-staticdatadir    directory to store citadels system messages under],
+			[ if test "x$withval" != "xno" ; then
+						  AC_DEFINE(HAVE_STATICDATA_DIR, [], [should we activate an alternate static text location?])
+						  AC_DEFINE_UNQUOTED(STATICDATA_DIR, "$withval", [where do we put our static text data?])
+						  MAKE_STATICDATA_DIR=$withval
+						  AC_SUBST(MAKE_STATICDATA_DIR)
 			  fi
 			]
 )
@@ -35,7 +61,7 @@ dnl Checks for the SSLdir
 dnl this is a bit different than the rest, 
 dnl because of the citadel used to have a keys/ subdir.
 AC_ARG_WITH(ssldir, 
-		    [  --with-ssldir          directory to store the ssl certificates under],
+		    [  --with-ssldir           directory to store the ssl certificates under],
 			[ if test "x$withval" != "xno" ; then
 					      
 						  ssl_dir="$withval"
@@ -50,8 +76,8 @@ dnl Checks for the spooldir
 AC_ARG_WITH(spooldir, 
 			[  --with-spooldir         directory to keep queues under],
 			[ if test "x$withval" != "xno" ; then
-					    AC_DEFINE(HAVE_SPOOL_DIR)
-						AC_DEFINE_UNQUOTED(SPOOL_DIR,"$withval")
+						AC_DEFINE(HAVE_SPOOL_DIR, [], [enable alternate spool dir?])
+						AC_DEFINE_UNQUOTED(SPOOL_DIR,"$withval", [where do we place our spool dirs?])
 						MAKE_SPOOL_DIR=$withval
 						AC_SUBST(MAKE_SPOOL_DIR)
 			   fi
@@ -63,21 +89,45 @@ dnl Checks for the Configdir
 AC_ARG_WITH(sysconfdir, 
 			[  --with-sysconfdir       directory to store the configs under],
 			[ if test "x$withval" != "xno" ; then
-					    AC_DEFINE(HAVE_ETC_DIR)
-						AC_DEFINE_UNQUOTED(ETC_DIR, "$withval")
+					    AC_DEFINE(HAVE_ETC_DIR, [], [should we search our system config in an alternate place?])
+						AC_DEFINE_UNQUOTED(ETC_DIR, "$withval", [where to search our config files])
 						MAKE_ETC_DIR=$withval
 						AC_SUBST(MAKE_ETC_DIR)
 			  fi
 			]
 )
 
+dnl Checks for the Configdir
+AC_ARG_WITH(autosysconfdir, 
+			[  --with-autosysconfdir	 directory to store the automaticaly maintained configs under],
+			[ if test "x$withval" != "xno" ; then
+					    AC_DEFINE(HAVE_AUTO_ETC_DIR, [], [should we search our automatic config in an alternate place?])
+						AC_DEFINE_UNQUOTED(AUTO_ETC_DIR, "$withval", [where to search our automatic config files])
+						MAKE_AUTO_ETC_DIR=$withval
+						AC_SUBST(MAKE_AUTO_ETC_DIR)
+			  fi
+			]
+)
+
+dnl Checks for where to put our utilities
+AC_ARG_WITH(utility-bindir, 
+			[  --with-utility-bindir   directory where to find helper binaries],
+			[ if test "x$withval" != "xno" ; then
+					    AC_DEFINE(HAVE_UTILBIN_DIR,[],[should we put our helper binaries to another location?])
+						AC_DEFINE_UNQUOTED(UTILBIN_DIR, "$withval", [were to put our helper programs])
+						MAKE_UTILBIN_DIR=$withval
+						AC_SUBST(MAKE_UTILBIN_DIR)
+			  fi
+			]
+)
+
 
 dnl Checks for the run-dir for the sockets
 AC_ARG_WITH(rundir, 
-			[  --with-rundir           directory to store the configs under],
+			[  --with-rundir           directory to place runtime files (UDS) to?],
 			[ if test "x$withval" != "xno" ; then
-					    AC_DEFINE(HAVE_RUN_DIR)
-						AC_DEFINE_UNQUOTED(RUN_DIR, "$withval")
+					    AC_DEFINE(HAVE_RUN_DIR, [], [should we put our non volatile files elsewhere?])
+						AC_DEFINE_UNQUOTED(RUN_DIR, "$withval", [define, where the config should go in unix style])
 						MAKE_RUN_DIR=$withval
 						AC_SUBST(MAKE_RUN_DIR)
 			  fi
@@ -86,11 +136,11 @@ AC_ARG_WITH(rundir,
 
 
 dnl Checks for the Pseudo Random Generator sockets TODO: this keeps being default.
-AC_DEFINE_UNQUOTED(EGD_POOL, "/var/run/egd-pool")
+AC_DEFINE_UNQUOTED(EGD_POOL, "/var/run/egd-pool", [place to keep our pseudo random generator file])
 AC_ARG_WITH(egdpool, 
 			[  --with-egdpool          the socket from Pseudo Random Generator, defaults to /var/run/egd-pool],
 			[ if test "x$withval" != "xno" ; then
-						AC_DEFINE_UNQUOTED(EGD_POOL, "$withval")
+						AC_DEFINE_UNQUOTED(EGD_POOL, "$withval", [the socket from Pseudo Random Generator])
 			  fi
 			]
 )
@@ -106,8 +156,81 @@ 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 Here is the check for a libc integrated iconv
+AC_ARG_ENABLE(iconv,
+	[  --disable-iconv         do not use iconv charset conversion],
+	ok_iconv=no, ok_iconv=yes)
+
+AC_MSG_CHECKING(Checking to see if your system supports iconv)
+AC_TRY_RUN([
+ 	#include <iconv.h>
+ 	main() {
+ 		iconv_t ic = (iconv_t)(-1) ;
+ 		ic = iconv_open("UTF-8", "us-ascii");
+ 		iconv_close(ic);
+ 		exit(0);
+ 	}
+ ],
+		[
+		  ok_iconv=yes
+		  AC_MSG_RESULT([yes])
+		],
+		[ 
+		  ok_iconv=no
+		  AC_MSG_RESULT([no])
+		]
+)
+
+dnl Check for iconv in external libiconv
+if test "$ok_iconv" = no; then
+	AC_MSG_CHECKING(Checking for an external libiconv)
+	OLD_LDFLAGS="$LDFLAGS"
+	LDFLAGS="$LDFLAGS -liconv"
+	AC_TRY_RUN([
+			#include <iconv.h>
+			main() {
+				iconv_t ic = (iconv_t)(-1) ;
+				ic = iconv_open("UTF-8", "us-ascii");
+				iconv_close(ic);
+			}
+		],
+			[
+			  ok_iconv=yes
+			  AC_MSG_RESULT([yes])
+			],
+			[ 
+			  ok_iconv=no
+			  LDFLAGS="$OLD_LDFLAGS"
+			  AC_MSG_RESULT([no])
+			]
+		)
+fi	
+if test "$ok_iconv" != "no"; then
+	AC_MSG_RESULT(Citadel will be built with character set conversion.)
+	AC_DEFINE(HAVE_ICONV,[],[whether we have iconv for charset conversion])
+else
+	AC_MSG_RESULT(Citadel will be built without character set conversion.)
+fi
+
+AC_CHECK_LIB(intl, libintl_bindtextdomain, [LDFLAGS="$LDFLAGS -lintl"])
+
 
-AC_ARG_ENABLE(chkpwd, [  --disable-chkpwd        don't build 'chkpwd'])
 
 AC_ARG_ENABLE(threaded-client, [  --disable-threaded-client
 			  disable multithreaded client])
@@ -116,7 +239,7 @@ AC_ARG_ENABLE(pie, [  --enable-pie            build position-independent executa
 
 AC_ARG_WITH(pam, [  --with-pam              use PAM if present (see PAM.txt before you try this)])
 AC_ARG_WITH(kthread, [  --with-kthread          use kernel threads (on FreeBSD) (not recommended yet)])
-AC_ARG_WITH(db, [  --with-db@<:@=DIR@:>@         use Sleepycat DB 3.x @<:@DIR=/usr/local/BerkeleyDB.3.@<:@123@:>@@:>@])
+AC_ARG_WITH(db, [  --with-db@<:@=DIR@:>@         use Berkeley DB 3.x @<:@DIR=/usr/local/BerkeleyDB.3.@<:@123@:>@@:>@])
 AC_ARG_WITH(ssl,
 	[  --with-ssl=PATH         Specify path to OpenSSL installation ],
 	[
@@ -127,10 +250,9 @@ AC_ARG_WITH(ssl,
 )
 AC_ARG_WITH(ncurses, [  --without-ncurses       don't use ncurses])
 
-AC_ARG_WITH(with_zlib, [  --with-zlib             use zlib compression if present])
 AC_ARG_WITH(with_ldap, [  --with-ldap             use OpenLDAP client library])
-AC_ARG_WITH(with_libical, [  --with-libical          use libical calendaring library])
-AC_ARG_WITH(with_libsieve, [  --with-libsieve         use libsieve mail sorting 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])
 
 if test "x$with_db" != xno -a "x$with_db" != xyes -a "$with_db"; then
 	db_dir="$with_db"
@@ -143,6 +265,8 @@ else
 	test -d /usr/local/BerkeleyDB.4.1 && db_dir=/usr/local/BerkeleyDB.4.1
 	test -d /usr/local/BerkeleyDB.4.2 && db_dir=/usr/local/BerkeleyDB.4.2
 	test -d /usr/local/BerkeleyDB.4.3 && db_dir=/usr/local/BerkeleyDB.4.3
+	test -d /usr/local/BerkeleyDB.4.4 && db_dir=/usr/local/BerkeleyDB.4.4
+	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
@@ -158,19 +282,19 @@ case "$host" in
 	dnl Also has stupid non-reentrant gethostbyaddr() and friends.
 	*-*-bsdi[123]*)
 		test -z "$CC" -a -x /usr/bin/shlicc2 && CC=shlicc2
-		AC_DEFINE(HAVE_NONREENTRANT_NETDB)
+		AC_DEFINE(HAVE_NONREENTRANT_NETDB,[], [define this if the OS has broken non-reentrant gethostby{name,addr}() ])
 		AC_MSG_RESULT([Old BSDI])
 	;;
 	*-*-bsdi*)
-		AC_DEFINE(HAVE_NONREENTRANT_NETDB)
+		AC_DEFINE(HAVE_NONREENTRANT_NETDB, [], [define this if the OS has broken non-reentrant gethostby{name,addr}() ])
 		AC_MSG_RESULT([BSD/OS])
 	;;
 	dnl Curses support on Mac OS X is kind of screwed at the moment.
 	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)
-		AC_DEFINE(HAVE_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])
 	;;
 	dnl Digital Unix has an odd way to build for pthreads, and we can't
@@ -220,6 +344,8 @@ dnl DEFS="$DEFS $PTHREAD_DEFS"
 dnl Checks for programs.
 AC_PROG_CC
 
+
+
 dnl Set up system-dependent compiler flags.
 if test "$GCC" = yes; then
 	if test "$CC" = icc; then
@@ -250,6 +376,15 @@ if test "x$enable_pie" = xyes; then
 	fi
 fi
 
+AC_MSG_CHECKING([how to create dependancy checks])
+		 if test -n "`$CC -V 2>&1 |grep Sun`"; then 
+		     	DEPEND_FLAG=-xM;
+		 else 
+		        DEPEND_FLAG=-M
+	         fi
+AC_SUBST(DEPEND_FLAG)
+
+
 AC_PROG_INSTALL
 AC_PROG_YACC
 missing_dir=`cd $ac_aux_dir && pwd`
@@ -263,6 +398,7 @@ AC_CHECK_SIZEOF(char, 0)
 AC_CHECK_SIZEOF(short, 0)
 AC_CHECK_SIZEOF(int, 0)
 AC_CHECK_SIZEOF(long, 0)
+AC_CHECK_SIZEOF(size_t, 0)
 dnl AC_CHECK_SIZEOF(long long, 0)
 
 dnl Checks for libraries.
@@ -270,7 +406,41 @@ 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)
+AC_CHECK_FUNCS(crypt gethostbyname connect flock getpwnam_r getpwuid_r getloadavg)
+
+
+dnl disable backtrace if we don't want it.
+AC_ARG_WITH(backtrace, 
+		    [  --with-backtrace        enable backtrace dumps in the syslog],
+			[ if test "x$withval" != "xno" ; then
+			     CFLAGS="$CFLAGS  -rdynamic "
+			     LDFLAGS="$LDFLAGS  -rdynamic "
+			     SERVER_LDFLAGS="$SERVER_LDFLAGS  -rdynamic "
+                             AC_CHECK_FUNCS(backtrace)
+			  fi
+			]
+)
+
+dnl disable backtrace if we don't want it.
+AC_ARG_WITH(gprof, 
+		    [  --with-gprof            enable profiling],
+			[ if test "x$withval" != "xno" ; then
+			     CFLAGS="$CFLAGS  -pg "
+			     LDFLAGS="$LDFLAGS  -pg "
+			     SERVER_LDFLAGS="$SERVER_LDFLAGS  -pg "
+			  fi
+			]
+)
+
+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)
@@ -287,13 +457,11 @@ dnl Determine the system's authentication capabilities.
 dnl We currently support PAM, standard getpwnam(), and getspnam()
 dnl (Linux shadow passwords)
 
-	if test "$with_pam" = yes; then
-		save_LIBS=$LIBS
-		AC_CHECK_LIB(pam, pam_start, [chkpwd_LIBS="-lpam $chkpwd_LIBS"
-			LIBS="-lpam $LIBS"])
-		AC_CHECK_FUNCS(pam_start)
-		test "$enable_chkpwd" != no && LIBS=$save_LIBS
-	fi
+save_LIBS=$LIBS
+AC_CHECK_LIB(pam, pam_start, [chkpwd_LIBS="-lpam $chkpwd_LIBS"
+	LIBS="-lpam $LIBS"])
+AC_CHECK_FUNCS(pam_start)
+test "$enable_chkpwd" != no && LIBS=$save_LIBS
 	if test "$ac_cv_func_pam_start" = no -o "$with_pam" != yes; then
 		save_LIBS=$LIBS
 		AC_SEARCH_LIBS(getspnam, shadow, [
@@ -308,17 +476,6 @@ dnl (Linux shadow passwords)
 					LIBS="-lcrypt $LIBS"])
 		fi
 	fi
-	if test "$ac_cv_func_crypt" = yes -o "$ac_cv_lib_crypt_crypt" = yes -o "$ac_cv_func_pam_start" = yes; then
-		if test "$enable_chkpwd" != no; then
-			AC_DEFINE(ENABLE_CHKPWD)
-			CHKPWD=chkpwd
-		else
-			AUTH=auth.lo
-		fi
-	fi
-
-test -f /usr/local/lib/libresolv.a && LDFLAGS="$LDFLAGS -L/usr/local/lib"
-AC_CHECK_LIB(resolv, res_query, RESOLV="$RESOLV -lresolv")
 
 if test "x$with_ncurses" != "xno"; then
 	AC_SEARCH_LIBS(tgetent, [ncurses curses termcap])
@@ -339,6 +496,62 @@ fi
 
 test -d /usr/kerberos/include && CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
 
+dnl Checks for the libical iCalendar library.
+AC_CHECK_HEADER(libical/ical.h,
+	[AC_CHECK_LIB(ical, icaltimezone_set_tzid_prefix,
+		[
+			SERVER_LIBS="-lical $SERVER_LIBS"
+		],
+		[
+			AC_MSG_ERROR(libical was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
+		]
+	,
+	)],
+	[
+		AC_MSG_ERROR(libical/ical.h was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
+	]
+)
+
+
+dnl Checks for the libsieve mailbox sorting library.
+AC_CHECK_HEADER(sieve2.h,
+	[AC_CHECK_LIB(sieve, sieve2_license,
+		[
+			SERVER_LIBS="-lsieve $SERVER_LIBS"
+		],
+		[
+			AC_MSG_ERROR(libsieve was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
+		]
+	,
+	)],
+	[
+		AC_MSG_ERROR(sieve2.h was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
+	]
+)
+
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $SERVER_LIBS"
+dnl Check for libcitadel
+AC_CHECK_HEADER(libcitadel.h,
+	[AC_CHECK_LIB(citadel, libcitadel_version_string,
+		[
+			LIBS="-lcitadel $LIBS $SERVER_LIBS"
+			chkpwd_LIBS="-lcitadel $chkpwd_LIBS"
+		],
+		[
+			AC_MSG_ERROR(libcitadel was not found or is not usable.  Please install libcitadel.)
+		]
+	,
+	)],
+	[
+		AC_MSG_ERROR(libcitadel.h was not found or is not usable.  Please install libcitadel.)
+	]
+)
+
+CFLAGS="$saved_CFLAGS"
+
+
+
 # The big search for OpenSSL
 if test "$with_ssl" != "no"; then
 	saved_LIBS="$LIBS"
@@ -420,7 +633,7 @@ if test "$with_ssl" != "no"; then
 	CFLAGS="$saved_CFLAGS"
 	
 	if test "x$ac_cv_openssldir" != "xno" ; then
-		AC_DEFINE(HAVE_OPENSSL)
+		AC_DEFINE(HAVE_OPENSSL, [], [Define if you have OpenSSL.])
 		LIBS="-lssl -lcrypto $LIBS"
 		dnl Need to recover ssldir - test above runs in subshell
 		ssldir=$ac_cv_openssldir
@@ -467,7 +680,7 @@ if test "x$with_db" != xno; then
 
 	AC_CHECK_DB([db db-4.1 db-4 db4],
 		    [
-		     DATABASE=database_sleepycat.c
+		     DATABASE=database.c
 		    ],
 		    AC_MSG_ERROR([[Can not locate a suitable Berkeley DB
 				  library.  Use --with-db=PATH to specify
@@ -475,19 +688,6 @@ if test "x$with_db" != xno; then
 
 fi
 
-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
-	SERVER_LIBS="-lz $SERVER_LIBS"
-	AC_DEFINE(HAVE_ZLIB)
-fi
-
 
 
 
@@ -501,62 +701,88 @@ fi
 
 if test "x$ok_ldap" = xyes ; then
 	SERVER_LIBS="-lldap $SERVER_LIBS"
-	AC_DEFINE(HAVE_LDAP)
+	AC_DEFINE(HAVE_LDAP, [], [define this if you have OpenLDAP client available])
 fi
 
 
 
 
 
-dnl Checks for the libsieve mailbox sorting library.
-if test "x$with_libsieve" != xno ; then
-	AC_CHECK_HEADERS(sieve2.h,
-		[AC_CHECK_LIB(sieve, sieve2_license,
-			[ok_libsieve=yes],,
+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_libsieve" = xyes ; then
-	SERVER_LIBS="-lsieve $SERVER_LIBS"
-	AC_DEFINE(HAVE_LIBSIEVE)
+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 libical calendaring library.
-if test "x$with_libical" != xno ; then
-	AC_CHECK_HEADERS(ical.h,
-		[AC_CHECK_LIB(ical, icalcomponent_new,
-			[ok_libical=yes],,
-	)])
-fi
 
-if test "x$ok_libical" = xyes ; then
+dnl Checks for the libdspam mail spam scanning library.
+dnl if test "x$with_libdspam" != xno ; then
+dnl 	AC_CHECK_HEADERS(dspam/libdspam.h,
+dnl 		[AC_CHECK_LIB(dspam, dspam_init,
+dnl 			[ok_libdspam=yes],,
+dnl 	)])
+dnl fi
+dnl 
+dnl if test "x$ok_libdspam" = xyes ; then
+dnl 	SERVER_LIBS="-ldspam $SERVER_LIBS"
+dnl 	AC_DEFINE(HAVE_LIBDSPAM, [], [(unfinished) define this if you have the libdspam mail spam scanning library available])
+dnl fi
+
 
-	AC_TRY_RUN(
+
+dnl Checks for the Expat XML parser.
+AC_CHECK_HEADER(expat.h,
+	[AC_CHECK_LIB(expat, XML_ParserCreateNS,
 		[
-#include <ical.h>
-main() {
-        int major, minor, v;
-        sscanf(ICAL_VERSION, "%d.%d", &major, &minor);
-        v = 100*major + minor;
-        printf("libical version: %i\n", v);
-        if (v >= 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);
-}
-		], 
+			SERVER_LIBS="-lexpat $SERVER_LIBS"
+		],
 		[
-			SERVER_LIBS="-lical $SERVER_LIBS"
-			AC_DEFINE(HAVE_LIBICAL)
+			AC_MSG_ERROR(The Expat XML parser was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
 		]
-	)
-fi
+	,
+	)],
+	[
+		AC_MSG_ERROR(expat.h was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
+	]
+)
+
+
+
+
+
+
+
+dnl Checks for libcurl.
+AC_CHECK_HEADER(curl/curl.h,
+	[AC_CHECK_LIB(curl, curl_version,
+		[
+			SERVER_LIBS="-lcurl $SERVER_LIBS"
+		],
+		[
+			AC_MSG_ERROR(libcurl was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
+		]
+	,
+	)],
+	[
+		AC_MSG_ERROR(curl/curl.h was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
+	]
+)
+
+
+
+
+
+
 
 
 
@@ -570,7 +796,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 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)
+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 syscall.h sys/syscall.h)
 
 dnl
 dnl need to check if this is actually compilable, sometimes there are
@@ -580,7 +806,7 @@ if test "x$with_ncurses" != xno; then
 	AC_CHECK_HEADERS(ncurses.h,,,[ ])
 fi
 
-AC_CHECK_HEADER(resolv.h,AC_DEFINE(HAVE_RESOLV_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
 #include <sys/types.h>
 #endif
@@ -606,15 +832,77 @@ AC_CACHE_CHECK([for ut_type in struct utmp], ac_cv_struct_ut_type,
 #include <utmp.h>], [struct utmp ut; ut.ut_type;],
 ac_cv_struct_ut_type=yes, ac_cv_struct_ut_type=no)])
 if test $ac_cv_struct_ut_type = yes; then
-	AC_DEFINE(HAVE_UT_TYPE)
+	AC_DEFINE(HAVE_UT_TYPE, [], [define this if struct utmp has an ut_type member])
+fi
+
+AC_CACHE_CHECK(
+	[for call semantics from getpwuid_r], 
+	ac_cv_call_getpwuid_r,
+	[AC_TRY_COMPILE([#include <sys/types.h>
+#include <pwd.h>], 
+                         [
+				struct passwd pw, *pwp;
+				char pwbuf[64];
+				uid_t uid;
+
+				getpwuid_r(uid, &pw, pwbuf, sizeof(pwbuf), &pwp);
+			],
+			ac_cv_call_getpwuid_r=yes, 
+			ac_cv_call_getpwuid_r=no)
+	])
+
+if test $ac_cv_call_getpwuid_r = no; then
+	AC_DEFINE(SOLARIS_GETPWUID,[],[do we need to use solaris call syntax?])
+	AC_DEFINE(F_UID_T, "%ld", [whats the matching format string for uid_t?])
+	AC_DEFINE(F_PID_T, "%ld",  [whats the matching format string for pid_t?])
+	AC_DEFINE(F_XPID_T, "%lx",  [whats the matching format string for xpid_t?])
+else
+	AC_DEFINE(F_UID_T, "%d",  [whats the matching format string for uid_t?])
+	AC_DEFINE(F_PID_T, "%d",  [whats the matching format string for pid_t?])
+	AC_DEFINE(F_XPID_T, "%x",  [whats the matching format string for xpid_t?])
 fi
 
+
+dnl Our own happy little check for the resolver library.
+
+case "`uname -a`" in 
+ OpenBSD*)
+	echo "we don't need to check for resolv on openbsd"  
+	;;
+ FreeBSD*)
+	echo "we don't need to check for resolv on freeBSD"  
+	;;
+ *)
+	test -f /usr/local/lib/libresolv.a && LDFLAGS="$LDFLAGS -L/usr/local/lib"
+	AC_CHECK_LIB(resolv, res_query,
+		RESOLV="$RESOLV -lresolv",
+		[dnl Have to include resolv.h as res_query is sometimes defined as a macro
+			AC_MSG_CHECKING([for res_query in -lresolv (with resolv.h if present)])
+ 			saved_libs="$LIBS"
+ 			LIBS="-lresolv $LIBS"
+ 			AC_TRY_LINK([
+ 				#ifdef HAVE_RESOLV_H
+ 				#include <resolv.h>
+ 				#endif],
+ 				[res_query(0,0,0,0,0)],
+ 				[AC_MSG_RESULT(yes)
+ 						have_res_query=yes],
+ 				[AC_MSG_RESULT(no)
+					AC_MSG_ERROR(libresolv was not found.  Citadel requires the resolver library.)
+ 				])
+         ]
+	)
+	;;
+esac
+
+
+
 AC_CACHE_CHECK([for ut_host in struct utmp], ac_cv_struct_ut_host,
 [AC_TRY_COMPILE([#include <sys/types.h>
 #include <utmp.h>], [struct utmp ut; ut.ut_host;],
 ac_cv_struct_ut_host=yes, ac_cv_struct_ut_host=no)])
 if test $ac_cv_struct_ut_host = yes; then
-	AC_DEFINE(HAVE_UT_HOST)
+	AC_DEFINE(HAVE_UT_HOST, [], [define this if struct utmp has an ut_host member])
 fi
 
 dnl Checks for library functions.
@@ -643,7 +931,7 @@ AC_CACHE_CHECK([for pthread_cancel], ac_cv_func_pthread_cancel,
 #endif],
 ac_cv_func_pthread_cancel=yes, ac_cv_func_pthread_cancel=no)])
 if test "$ac_cv_func_pthread_cancel" = yes; then
-	AC_DEFINE(HAVE_PTHREAD_CANCEL)
+	AC_DEFINE(HAVE_PTHREAD_CANCEL, [], [define this if you have the pthread_cancel() function])
 fi
 
 AC_CACHE_CHECK([for pthread_create], ac_cv_func_pthread_create,
@@ -660,7 +948,7 @@ 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)
+		AC_DEFINE(THREADED_CLIENT, [], [define this if you want to enable the multithreaded client])
 	fi
 fi
 
@@ -692,6 +980,7 @@ AC_CACHE_CHECK([the weather], ac_cv_weather, [
 
 
 
+
 AC_CACHE_CHECK([under the bed], ac_cv_under_the_bed, [
 	number=`date | cut -c 19`
 	case $number in
@@ -704,9 +993,13 @@ AC_CACHE_CHECK([under the bed], ac_cv_under_the_bed, [
 	esac
 	])
 
+
+STRUCT_UCRED
+
+
+
 dnl Done! Now write the Makefile and sysdep.h
 AC_SUBST(AUTH)
-AC_SUBST(CHKPWD)
 AC_SUBST(RESOLV)
 AC_SUBST(chkpwd_LIBS)
 AC_SUBST(TARGETS)
@@ -714,7 +1007,6 @@ AC_SUBST(DATABASE)
 AC_SUBST(SERVER_LDFLAGS)
 AC_SUBST(SERVER_LIBS)
 AC_SUBST(SETUP_LIBS)
-AC_CONFIG_HEADER(sysdep.h)
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT(database_cleanup.sh)
 
@@ -722,11 +1014,40 @@ if test -z "$DATABASE"; then
 	AC_MSG_WARN([No database driver was found. Please install Berkeley DB.])
 fi
 
+abs_srcdir="`cd $srcdir && pwd`"
+abs_builddir="`pwd`"
+if test "$abs_srcdir" != "$abs_builddir"; then
+   ln -sf $abs_srcdir/include $abs_builddir
+   ln -sf $abs_srcdir/Make_sources $abs_builddir
+   ln -sf $abs_srcdir/Make_modules $abs_builddir
+   for i in $abs_srcdir/*.h ; do
+      if test "$abs_srcdir/sysdep.h" != "$i"; then
+         ln -sf $i $abs_builddir
+      fi
+   done
+   for d in `/bin/ls $abs_srcdir/modules/`; do 
+	(mkdir -p $abs_builddir/modules/$d) 
+   done
+   if test -d "$abs_srcdir/user_modules/"; then
+      for d in `/bin/ls $abs_srcdir/user_modules/`; do 
+      	(mkdir -p $abs_builddir/user_modules/$d) 
+   	done
+   fi
+   mkdir -p $abs_builddir/utils
+   mkdir -p $abs_builddir/utillib
+   mkdir -p $abs_builddir/textclient
+fi
+
+if test -n "$srcdir"; then 
+   export srcdir=.
+fi
+
+
 echo ------------------------------------------------------------------------
-echo 'zlib compression:                ' $ok_zlib
-echo 'Calendar support:                ' $ok_libical
 echo 'LDAP support:                    ' $ok_ldap
-echo 'Sieve mailbox filtering support: ' $ok_libsieve
+echo 'Character set conversion support:' $ok_iconv
+echo 'Boehm-Demers-Weiser support:     ' $ok_gc
+dnl echo 'DSpam Scanning support:          ' $ok_libdspam
 echo 
 echo 'Note: if you are not using Linux, make sure you are using GNU make'
 echo '(gmake) to compile Citadel.'