Moved 'setup' to the utils directory and converted the build

[citadel.git] / citadel / configure.ac

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 02507872000b55f127cfce6b534bb059066e4b98..a6ec3f514b7e20ca98f42d11f5a040bc49351d86 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -1,3 +1,18 @@
+
+
+
+FAIL FAIL FAIL
+
+THIS IS THE OLD CONFIGURE SCRIPT
+
+KEEPING IT HERE FOR REFERENCE AS WE BUILD THE NEW ONE
+
+DONT RUN THIS
+
+
+
+
+
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
@@ -181,6 +196,25 @@ AC_CHECK_HEADER(zlib.h,
 )
 CFLAGS="$saved_CFLAGS"
 
+dnl Checks for the crypt_r function
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $SERVER_LIBS"
+AC_CHECK_HEADER(crypt.h,
+       [AC_CHECK_LIB(crypt, crypt_r,
+               [
+                       SERVER_LIBS="-lcrypt $SERVER_LIBS"
+               ],
+               [
+                       AC_MSG_ERROR(crypt_r was not found or is not usable.)
+               ]
+       ,
+       )],
+       [
+               AC_MSG_ERROR(crypt.h was not found or is not usable.)
+       ]
+)
+CFLAGS="$saved_CFLAGS"
+
 dnl Here is the check for a libc integrated iconv
 AC_ARG_ENABLE(iconv,
        [  --disable-iconv         do not use iconv charset conversion],
@@ -510,22 +544,6 @@ AC_CHECK_HEADER(libical/ical.h,
 )
 
 
-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
@@ -934,7 +952,7 @@ AC_SUBST(SETUP_LIBS)
 AC_SUBST(DIFF)
 AC_SUBST(PATCH)
 AC_CONFIG_FILES([Makefile])
-AC_OUTPUT(database_cleanup.sh po/citadel-setup/Makefile)
+AC_OUTPUT(po/citadel-setup/Makefile)
 
 if test -z "$DATABASE"; then
        AC_MSG_WARN([No database driver was found. Please install Berkeley DB.])