* Autoconf fixes for DB4 support

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 0b9ea18152c91220122287b92807254cb2cee9ed..0abb6010ccadd18678f20879eb5c707526a1c9d0 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 590.127  2002/03/05 22:45:40  error
+ * Autoconf fixes for DB4 support
+
  Revision 590.126  2002/03/05 04:47:49  ajc
  * vcard.c: another API update
 
@@ -3390,4 +3393,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
-

diff --git a/citadel/configure.ac b/citadel/configure.ac
index ec7f25b0111adc86946f26ac143a8c7617182121..e633c23a9eb13d160e9b4b06fffe2626e8c548a0 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -352,7 +352,7 @@ AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 
-AC_CHECK_HEADERS(curses.h dl.h fcntl.h limits.h termios.h sys/ioctl.h sys/select.h sys/time.h syslog.h unistd.h utmp.h utmpx.h paths.h db.h db3/db.h)
+AC_CHECK_HEADERS(curses.h dl.h fcntl.h limits.h termios.h sys/ioctl.h sys/select.h sys/time.h syslog.h unistd.h utmp.h utmpx.h paths.h db.h db3/db.h db4/db.h)
 
 AC_CHECK_HEADER(resolv.h, [SMTP=modules/libsmtp.la; DOMAIN=domain.c])
 AC_SUBST(SMTP)

diff --git a/citadel/database_sleepycat.c b/citadel/database_sleepycat.c
index 2cca9a37e178b20839212f96b2d2a38bb4214fba..d98215036ac4c5710b9448a7819c14c2cf185ca0 100644 (file)
--- a/citadel/database_sleepycat.c
+++ b/citadel/database_sleepycat.c
@@ -33,10 +33,12 @@
 #include <sys/stat.h>
 #include <dirent.h>
 
-#ifdef HAVE_DB_H
-#include <db.h>
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
 #elif defined(HAVE_DB3_DB_H)
 #include <db3/db.h>
+#elif defined(HAVE_DB_H)
+#include <db.h>
 #else
 #error Neither <db.h> nor <db3/db.h> was found by configure. Install db3-devel.
 #endif