Adjust bdb library search paths: add 4.8 remove all before 4.6.

Also fix that atalk_libname was forced to "lib". The macro now
accepts the value from configure.in. In order to prevent problems
with custom built bdb packages where the lib path is "lib" instead
of the correct "lib64" on some 64bit systems, check inside "lib" too.

diff --git a/macros/db3-check.m4 b/macros/db3-check.m4
index 7d355b62bac201e29fe139fced8cd27bee19fc1a..b84f0536e0d92483ffc8f1127e2bccdf6d3f2de4 100644 (file)
--- a/macros/db3-check.m4
+++ b/macros/db3-check.m4
@@ -84,7 +84,7 @@ AC_DEFUN([AC_PATH_BDB],[
     trybdbdir=""
     dobdbsearch=yes
     bdb_search_dirs="/usr/local /usr"
-    search_subdirs="/ /db4.7 /db47 /db4.6 /db46 /db4.5 /db45 /db4.4 /db44 /db4"
+    search_subdirs="/ /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
 
     bdbfound=no
     savedcflags="$CFLAGS"
@@ -115,7 +115,6 @@ AC_DEFUN([AC_PATH_BDB],[
             dobdbsearch=yes
         else
             bdb_search_dirs="$withval"
-            atalk_libname=lib
         fi
     )
 
@@ -158,6 +157,28 @@ AC_DEFUN([AC_PATH_BDB],[
                             bdbfound=yes
                             break;
                         fi
+
+                        dnl -- Search for 64bit lib in "lib" too
+                        if test x"$atalk_libname" = x"lib64" ; then
+                           bdblibdir="${bdbdir}/lib"
+                           bdbbindir="${bdbdir}/bin"
+
+                           CPPFLAGS="-I${bdbdir}/include${subdir} $CPPFLAGS"
+                           LDFLAGS="-L$bdblibdir $LDFLAGS"
+
+                           eval export $shlibpath_var=$bdblibdir
+                           NETATALK_BDB_TRY_LINK
+                           eval export $shlibpath_var=$saved_shlibpath_var
+
+                           if test x"${atalk_cv_bdb_version}" = x"yes"; then
+                              BDB_CFLAGS="-I${bdbdir}/include${subdir}"
+                              BDB_LIBS="-L${bdblibdir} ${atalk_cv_lib_db}"
+                              BDB_BIN="$bdbbindir"
+                              BDB_PATH="$bdbdir"
+                              bdbfound=yes
+                              break;
+                           fi
+                        fi
                     fi
                     CFLAGS="$savedcflags"
                     LDFLAGS="$savedldflags"