restored the checks for /usr/include/db3 and /usr/local/include/db3

in configure.  there are too many variations on db installation; this is
getting messy :-(

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index c6772ebd3b58d8df5ad40e5c3c54fe9e8fb29cd4..877da9239333867f5e337b98e8de787db112031f 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,9 @@
  $Log$
+ Revision 590.11  2001/12/17 08:14:26  nbryant
+ restored the checks for /usr/include/db3 and /usr/local/include/db3
+ in configure.  there are too many variations on db installation; this is
+ getting messy :-(
+
  Revision 590.10  2001/12/17 08:00:45  nbryant
  set the pthreads stack size to 128K because FreeBSD's default of 64K
  seems too small. fixes crashes under FreeBSD.
@@ -2975,4 +2980,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 0b8cb2465839272d73be4b8e53311c286e80e668..91333cd0629d277c0e71f12796ca8149c0b8a430 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -222,7 +222,9 @@ AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 
-test "$db_dir" && CPPFLAGS="$CPPFLAGS -I$db_dir/include"
+test "$db_dir" && CPPFLAGS="$CPPFLAGS -I$db_dir/include" || \
+       ( test -d /usr/include/db3 && CPPFLAGS="$CPPFLAGS -I/usr/include/db3" ) || \
+       ( test -d /usr/local/include/db3 && CPPFLAGS="$CPPFLAGS -I/usr/local/include/db3" )
 
 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)