use <db.h> before <db3/db.h> or <db4/db.h>

this is the only way i can think of to make it work everywhere; people on
systems like FreeBSD where the ports work the other way around will have to
specify an extra -I flag in their CPPFLAGS variable.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 0521c48407ba590c5607bc7343b947975899f894..410c75f04f42b84074424084b20c1b80efc40546 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,10 @@
  $Log$
+ Revision 590.138  2002/03/11 06:00:21  nbryant
+ use <db.h> before <db3/db.h> or <db4/db.h>
+ this is the only way i can think of to make it work everywhere; people on
+ systems like FreeBSD where the ports work the other way around will have to
+ specify an extra -I flag in their CPPFLAGS variable.
+
  Revision 590.137  2002/03/11 05:42:46  nbryant
  removed all references to sprintf from several files (not all files yet)
  and replace with snprintf
@@ -3428,3 +3434,4 @@ 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/database_sleepycat.c b/citadel/database_sleepycat.c
index 07f16c4bb709c0445f2e59ce07091077adf2f000..77a7daaf6192c5ac3a69777102c71d37dfdffcdd 100644 (file)
--- a/citadel/database_sleepycat.c
+++ b/citadel/database_sleepycat.c
@@ -33,12 +33,12 @@
 #include <sys/stat.h>
 #include <dirent.h>
 
-#ifdef HAVE_DB4_DB_H
+#ifdef HAVE_DB_H
+#include <db.h>
+#elif defined(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