X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfigure.ac;h=8320a9dbf4b19f9d659f59054baa860675e7dd6e;hb=89614b347d070ebca99c71e613532371f7877234;hp=6e7280515b461a2877d538b242b38e8e03396b31;hpb=8df8dba5fed53c141fca6a34527660aade9b1640;p=citadel.git

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 6e7280515..8320a9dbf 100644
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -2,9 +2,11 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
 AC_INIT([Citadel],m4_esyscmd_s([grep REV_LEVEL citadel.h | sed 's/[^0-9]*//g']),[http://uncensored.citadel.org])
-AC_REVISION(m4_esyscmd_s([git log --pretty=%h | head -1])
+
+AC_REVISION(m4_esyscmd_s([git log --pretty=%h | head -1]))
+
 AC_CONFIG_SRCDIR([citserver.c])
-AC_CONFIG_HEADER(sysdep.h)
+AC_CONFIG_HEADER([sysdep.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PREFIX_DEFAULT(/usr/local/citadel)
 if test "$prefix" = NONE; then
@@ -257,14 +259,7 @@ if test "x$with_db" != xno -a "x$with_db" != xyes -a "$with_db"; then
 	with_db=yes
 else
 	test -f /usr/local/lib/libdb.a -o -f /usr/local/lib/libdb.so \
-	  -o -f /usr/local/lib/libdb4.a -o -f /usr/local/lib/libdb4.so \
 	  && db_dir=/usr/local
-
-	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
 
 AC_CANONICAL_HOST
@@ -515,22 +510,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
@@ -667,18 +646,12 @@ if test "x$with_db" != xno; then
 
 	dblib=""
 
-	if test -d "$db_dir/include/db4"; then
-		CPPFLAGS="$CPPFLAGS -I$db_dir/include/db4"
-		dblib="db4"
-	elif test "$db_dir"; then
+	if test "$db_dir"; then
 		CPPFLAGS="$CPPFLAGS -I$db_dir/include"
-	elif test -d /usr/include/db4; then
-		CPPFLAGS="$CPPFLAGS -I/usr/include/db4"
-		dblib="db4"
 	fi
 
 
-	AC_CHECK_DB([db db-4.1 db-4 db4],
+	AC_CHECK_DB([db],
 		    [
 		     DATABASE=database.c
 		    ],
@@ -749,7 +722,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(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)
+AC_CHECK_HEADERS(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 pthread.h netinet/in.h arpa/nameser.h arpa/nameser_compat.h syscall.h sys/syscall.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
@@ -919,8 +892,6 @@ 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
@@ -947,7 +918,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.])