DB3 patch check fix by Stefan Muenkner.

[netatalk.git] / macros / db3-check.m4

diff --git a/macros/db3-check.m4 b/macros/db3-check.m4
index a85941ea81480edc9b106b729fecc88e79abe71c..b036882bf2076e675f13f05c313dcee2c9fc5c87 100644 (file)
--- a/macros/db3-check.m4
+++ b/macros/db3-check.m4
@@ -1,4 +1,4 @@
-dnl $Id: db3-check.m4,v 1.9 2003-02-16 02:13:05 jmarcus Exp $
+dnl $Id: db3-check.m4,v 1.12 2003-06-06 19:45:51 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"