Do not check for DB_H definition anymore.

diff --git a/citadel/configure.ac b/citadel/configure.ac
index a513f58951324252761b7cd5f2ee554175ae01cf..02507872000b55f127cfce6b534bb059066e4b98 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -908,8 +908,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

diff --git a/citadel/database.c b/citadel/database.c
index a07e48ae75cb287e617c1949edd130a25d603f97..e8ec78d44f256d31d3b9a99861538e68a738f44c 100644 (file)
--- a/citadel/database.c
+++ b/citadel/database.c
@@ -33,10 +33,7 @@
 #include <dirent.h>
 #include <zlib.h>
 
-#ifdef HAVE_DB_H
 #include <db.h>
-#error <db.h> was not found by configure. Install the Berkeley DB development package.
-#endif
 
 #if DB_VERSION_MAJOR < 5
 #error Citadel requires Berkeley DB v5.0 or newer.  Please upgrade.

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index 781d2c02644f4d8fbf4352215672ad2e6004c6d8..89348bf37bec9f72a09906c67666ffa246ddff5d 100644 (file)
--- a/citadel/sysdep_decls.h
+++ b/citadel/sysdep_decls.h
@@ -9,10 +9,7 @@
 #include <pthread.h>
 #endif
 
-#ifdef HAVE_DB_H
 #include <db.h>
-#error <db.h> was not found by configure. Install the Berkeley DB development package.
-#endif
 
 #if DB_VERSION_MAJOR < 5
 #error Citadel requires Berkeley DB v5 or newer.  Please upgrade.

diff --git a/citadel/threads.h b/citadel/threads.h
index 28f73b520f5dc2278d6e36557a230b356a8d5968..21e790530e90c63d7ed54aa29fc0bfdf3a05c7b4 100644 (file)
--- a/citadel/threads.h
+++ b/citadel/threads.h
@@ -11,10 +11,7 @@
 #include <sys/time.h>
 #include <string.h>
 
-#ifdef HAVE_DB_H
 #include <db.h>
-#error <db.h> was not found by configure. Install the Berkeley DB development package.
-#endif
 
 #include "server.h"
 #include "sysdep_decls.h"