dnl Process this file with autoconf to produce a configure script.
dnl $Id$
AC_PREREQ(2.52)
-AC_INIT([Citadel], [7.00], [http://www.citadel.org/])
-AC_REVISION([$Revision$])
+AC_INIT([Citadel], [7.10], [http://www.citadel.org/])
+AC_REVISION([$Revision: 5108 $])
AC_CONFIG_SRCDIR([citserver.c])
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
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 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
+ ]
+)
+
+
+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],
+ [ if test "x$withval" != "xno" ; then
+
+ ssl_dir="$withval"
+ fi
+ AC_SUBST(MAKE_SSL_DIR)
+ ]
+)
+AC_DEFINE_UNQUOTED(SSL_DIR, "$ssl_dir", [were should we put our keys?])
+
+
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
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 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
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
]
)
-AC_ARG_ENABLE(autologin, [ --enable-autologin enable autologin (default is disabled)])
-AC_ARG_ENABLE(chkpwd, [ --disable-chkpwd don't build 'chkpwd'])
-
AC_ARG_ENABLE(threaded-client, [ --disable-threaded-client
disable multithreaded client])
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])
-AC_ARG_WITH(with_newt, [ --with-newt use newt window library])
if test "x$with_db" != xno -a "x$with_db" != xyes -a "$with_db"; then
db_dir="$with_db"
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(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
dnl Check for Solaris realtime support
AC_CHECK_LIB(rt, sched_yield)
-dnl Determine the system's authentication capabilities, if autologin is
-dnl requested. We currently support PAM, standard getpwnam(), and getspnam()
+dnl Determine the system's authentication capabilities.
+dnl We currently support PAM, standard getpwnam(), and getspnam()
dnl (Linux shadow passwords)
-if test "$enable_autologin" = yes; then
+
if test "$with_pam" = yes; then
save_LIBS=$LIBS
AC_CHECK_LIB(pam, pam_start, [chkpwd_LIBS="-lpam $chkpwd_LIBS"
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
- AC_DEFINE(ENABLE_AUTOLOGIN)
- if test "$enable_chkpwd" != no; then
- AC_DEFINE(ENABLE_CHKPWD)
- CHKPWD=chkpwd
- else
- AUTH=auth.lo
- fi
- fi
-fi
test -f /usr/local/lib/libresolv.a && LDFLAGS="$LDFLAGS -L/usr/local/lib"
AC_CHECK_LIB(resolv, res_query, RESOLV="$RESOLV -lresolv")
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
if test "x$ok_zlib" = xyes ; then
SERVER_LIBS="-lz $SERVER_LIBS"
- AC_DEFINE(HAVE_ZLIB)
+ AC_DEFINE(HAVE_ZLIB, [], [define this if you have zlib compression available])
fi
if test "x$ok_ldap" = xyes ; then
SERVER_LIBS="-lldap $SERVER_LIBS"
- AC_DEFINE(HAVE_LDAP)
-fi
-
-
-
-
-dnl Checks for the newt window library.
-if test "x$with_newt" != xno ; then
- AC_CHECK_HEADERS(newt.h,
- [AC_CHECK_LIB(newt, newtInit,
- [ok_newt=yes],,
- )])
-fi
-
-if test "x$ok_newt" = xyes ; then
- SETUP_LIBS="-lnewt $SETUP_LIBS"
- AC_DEFINE(HAVE_NEWT)
+ AC_DEFINE(HAVE_LDAP, [], [define this if you have OpenLDAP client available])
fi
if test "x$ok_libsieve" = xyes ; then
SERVER_LIBS="-lsieve $SERVER_LIBS"
- AC_DEFINE(HAVE_LIBSIEVE)
+ AC_DEFINE(HAVE_LIBSIEVE, [], [define this if you have the libsieve mailbox filtering library available])
fi
],
[
SERVER_LIBS="-lical $SERVER_LIBS"
- AC_DEFINE(HAVE_LIBICAL)
+ AC_DEFINE(HAVE_LIBICAL, [], [define this if you have the libical calendaring library available])
]
)
fi
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
#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 AC_CHECK_FUNCS(res_query)
+AC_CACHE_CHECK([for the resolver calls],
+ ac_cv_resquery_ok,
+[AC_TRY_COMPILE([#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>],
+ [
+ char *domain="www.google.com";
+ u_char *answer;
+ int len;
+ len = res_query( domain, C_IN, T_A, answer, PACKETSZ );
+ ],
+ ac_cv_resquery_ok=yes,
+ ac_cv_resquery_ok=no)
+])
+echo "resquery: $ac_cv_resquery_ok"
+
+dnl if test "$ac_cv_resquery_ok" = "no" ; then
+dnl AC_DEFINE(RES_QUERY_GONE, "#error resquery not here. can't continue.")
+dnl fi
+
+
+
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.
#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,
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
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([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
+ ])
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)