* Check the default location of Berkeley DB 3.0

* Check additionally for libdb-3

diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 1e0f645b234c8ac8066ca5a598914e17743328c8..d054d04ddf337c963f4679fb0f41c15b8611a07f 100644 (file)
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -155,18 +155,18 @@ AC_DBA_STD_RESULT
 AC_ARG_WITH(db3,
 [  --with-db3[=DIR]        Include Berkeley DB3 support],[
   if test "$withval" != "no"; then
-    for i in /usr/local /usr $withval; do
+    for i in /usr/local /usr /usr/local/BerkeleyDB.3.0 $withval; do
       if test -f "$i/include/db.h" ; then
         THIS_PREFIX="$i"
         DB3_EXTRA="db.h"
       fi
-       done
+    done
 
     if test -n "$DB3_EXTRA"; then
       AC_DEFINE_UNQUOTED(DB3_INCLUDE_FILE, "$DB3_EXTRA", [ ])
     fi
 
-    for LIB in db; do
+    for LIB in db db-3; do
       AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
       AC_CHECK_LIB($LIB, db_create, [AC_DEFINE(DBA_DB3,1,[ ]) THIS_LIBS="$LIB"])
       ])