* make the crypto functions use precalculated files instead of relative ones

[citadel.git] / citadel / configure.ac

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 2d03aefe6d8233e0cd65c2ab93ad17be4a56654d..fa8e70a8a66111069d6e5eda2c0997ef88f38cae 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -1,14 +1,16 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
 AC_PREREQ(2.52)
-AC_INIT([Citadel], [7.02], [http://www.citadel.org/])
+AC_INIT([Citadel], [7.03], [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
 
 
@@ -28,6 +30,22 @@ AC_ARG_WITH(datadir,
                        ]
 )
 
+
+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],
@@ -682,7 +700,19 @@ AC_CACHE_CHECK([under the bed], ac_cv_under_the_bed, [
                ;;
        esac
        ])
-
+AC_CANONICAL_HOST
+AC_MSG_CHECKING([for reality distorion field])
+case "$host" in
+       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(HAVE_DARWIN)
+               AC_MSG_RESULT([present])
+       ;;
+       *)
+               AC_MSG_RESULT([missing])
+       ;;
+esac
 dnl Done! Now write the Makefile and sysdep.h
 AC_SUBST(AUTH)
 AC_SUBST(CHKPWD)