Check for BDB4 libs in $lib as well as $lib/$ver (fixes pkgsrc BDB4 detection)

diff --git a/ChangeLog b/ChangeLog
index 271109f70a89948e947fbe65306d3f42b1f48ebf..970d20abdebf577a649e46254beb9aaebb9803ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2007-04-04 11:47 -0700  Brendan Cully  <brendan@kublai.com>  (5e0ea671962d)
+2007-04-05 12:55 -0700  Brendan Cully  <brendan@kublai.com>  (4f435337507e)
+
+       * Makefile.am, hcache.c, hcachever.sh: Version header cache against
+       MD5 of structures on which it depends
+
+       * UPDATING, globals.h, imap/browse.c, imap/imap_private.h, init.h:
+       Remove broken namespace support
+
+2007-04-04 16:31 -0700  Brendan Cully  <brendan@kublai.com>  (e96bd1f85634)
 
        * imap/command.c: Only reset UIDNEXT if new mail has been detected.
        This prevents mutt from suddenly finding new mail when switching

diff --git a/configure.ac b/configure.ac
index 4f972e59106b2ac1de9d55ebe106290b38a8adce..0f891cb5286e3a8551fc5930148f724309952c63 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -874,8 +874,9 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching])
             for v in / $BDB_VERSIONS; do
                 if test -r "$d/include/$v/db.h"; then
                     BDB_INCLUDE_DIR="$d/include/$v"
-                    if test -d "$d/lib/$v"; then
-                        BDB_LIB_DIR="$d/lib/$v"
+                    for bdblibdir in "$d/lib/$v" "$d/lib"; do
+                    if test -d "$bdblibdir"; then
+                        BDB_LIB_DIR="$bdblibdir"
                         for l in `echo $BDB_VERSIONS`; do
                             CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR"
                             LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$l"
@@ -893,6 +894,7 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching])
                         done
                         test x$ac_cv_dbcreate = xyes && break
                     fi
+                    done
                 fi
             done
             test x$BDB_LIB != x && break