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_INIT([Citadel], [7.10], [http://www.citadel.org/])
AC_REVISION([$Revision$])
AC_CONFIG_SRCDIR([citserver.c])
AC_PREFIX_DEFAULT(/usr/local/citadel)
if test "$prefix" = NONE; then
AC_DEFINE_UNQUOTED(CTDLDIR, "$ac_default_prefix")
+ ssl_dir="$ac_default_prefix/keys"
else
AC_DEFINE_UNQUOTED(CTDLDIR, "$prefix")
+ ssl_dir="$prefix/keys"
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],
-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
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"
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_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"
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
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")
-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)
-fi
-
-
-
-
dnl Checks for the libsieve mailbox sorting library.
if test "x$with_libsieve" != xno ; then
AC_DEFINE(HAVE_UT_TYPE)
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)
+ AC_DEFINE(F_UID_T, "%ld")
+ AC_DEFINE(F_PID_T, "%ld")
+ AC_DEFINE(F_XPID_T, "%lx")
+else
+ AC_DEFINE(F_UID_T, "%d")
+ AC_DEFINE(F_PID_T, "%d")
+ AC_DEFINE(F_XPID_T, "%x")
+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_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
+ ])
projects / citadel.git / blobdiff