X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfigure.ac;h=a513f58951324252761b7cd5f2ee554175ae01cf;hb=50ff39d933b7178377b3a67f8edc31ffa42ffd28;hp=17a5259910debb47a673d7f2e744f5651a6a8c2f;hpb=bd8aec5ecea29ad91c64b2ea12ed3b7b8c1a543d;p=citadel.git

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 17a525991..a513f5895 100644
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -1,9 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
-AC_INIT([Citadel], [916], [http://www.citadel.org/])
-AC_REVISION([$Revision: 5108 $])
+
+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_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
@@ -256,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
@@ -666,18 +662,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
 		    ],
@@ -748,7 +738,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