BDB path fix.

diff --git a/NEWS b/NEWS
index 949407b4794654641d041c090672e5c8f56bcdfd..cd457e48bfe2f9175d7a4ab76457d37261b7228a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Changes in 1.6.3
 * FIX: afpd: Debugging using SIGUSR1 was broken. [Stefan Muenkner]
 * FIX: shell_utils: Don't distribute generated files.
 * FIX: aecho: -A option didn't work. [Chris Shiels]
+* FIX: configure: Berkeley DB path detection could be wrong. [Stefan Muenkner]
 * FIX: Automake build fixes.
 
 Changes in 1.6.2

diff --git a/macros/db3-check.m4 b/macros/db3-check.m4
index deb4e68f375c222b434a7d958a27b51664d2e55f..ec919cdb670d6310df77971d7d75da1295e6eab5 100644 (file)
--- a/macros/db3-check.m4
+++ b/macros/db3-check.m4
@@ -1,4 +1,4 @@
-dnl $Id: db3-check.m4,v 1.7.4.2 2003-02-16 02:14:07 jmarcus Exp $
+dnl $Id: db3-check.m4,v 1.7.4.3 2003-06-06 19:51:15 srittau Exp $
 dnl Autoconf macro to check for the Berkeley DB library
 
 AC_DEFUN([AC_PATH_BDB], [
@@ -24,10 +24,16 @@ AC_DEFUN([AC_PATH_BDB], [
                        LDFLAGS="-L$bdblibdir $LDFLAGS"
                        AC_CHECK_LIB(db, main, [
                                bdbfound=yes
-                               BDB_CFLAGS="-I$bdbdir"
-                               BDB_LIBS="-L$bdblibdir -ldb"
+                               if test "$bdbdir" != "/usr/include"; then
+                                   BDB_CFLAGS="-I$bdbdir"
+                               fi
+                               if test "$bdblibdir" != "/usr/lib"; then
+                                   BDB_LIBS="-L$bdblibdir"
+                               fi
+                               BDB_LIBS="$BDB_LIBS -ldb"
                                BDB_BIN=$bdbbindir
                                BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`"
+                               BDB_PATH="`echo $BDB_PATH | sed 's,include$,,'`"
                        ])
                        CFLAGS="$savedcflags"
                        LDFLAGS="$savedldflags"