Update

git-svn-id: file:///svnroot/mailfromd/trunk@1503 7a8a7f39-df28-0410-adc6-e0d955640f24

2 files changed, 18 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a5080e74..58712442 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-11  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+        * configure.ac (check_slackware_bdb): Add heuristics to find the
+        correct include directory.
+
 2007-08-10  Sergey Poznyakoff  <gray@gnu.org.ua>
 
         * src/gram.y (on_cond): Fix coredump if target address is not
diff --git a/configure.ac b/configure.ac
index 3f449a2f..2be026fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -231,7 +231,17 @@ AC_SUBST(MU_COMMON_INCLUDES)
 check_slackware_bdb() {
         dir=db`echo $1|tr -d '.'`
         save_CPPFLAGS=$CPPFLAGS
-        CPPFLAGS="$CPPFLAGS -I/usr/include/$dir"
+        while test -n "$dir"
+        do
+                if test -d /usr/include/$dir; then
+                        CPPFLAGS="$CPPFLAGS -I/usr/include/$dir"
+                        break
+                elif test -d /usr/local/include/$dir; then
+                        CPPFLAGS="$CPPFLAGS -I/usr/local/include/$dir"
+                        break
+                fi              
+                dir=`expr "$dir" : '\(.*\)[[0-9]]$'`
+        done
         check_bdb $1 db-$1 db_create
         CPPFLAGS=$save_CPPFLAGS
         if test $status_dbm = "$1"; then
@@ -251,7 +261,7 @@ try_dbm() {
                      status_dbm=GDBM]);;
 
   BDB2)   check_bdb 2 db db_open
-          test -n "$status_dbm" && status_dbm="Berkeley DB v. $status_dbm";;
+          test "$status_dbm" != "no" && status_dbm="Berkeley DB v. $status_dbm";;
 
   BDB)    for version in 4 3 2
           do
@@ -283,7 +293,7 @@ try_dbm() {
                      done
                      ;;
           esac
-          test -n "$status_dbm" && status_dbm="Berkeley DB v. $status_dbm"
+          test "$status_dbm" != "no" && status_dbm="Berkeley DB v. $status_dbm"
           ;;
   esac
 }