X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=macros%2Fdb3-check.m4;h=a9c66325bfa5d48fadf89639c1dcc43105c3a3a3;hp=1d27b4336facbbdf3bc087988e39dac61316a1ca;hb=f48dd8452cfa107300ad2f1ffb09aef7979820b8;hpb=d4968881133f5a9ac745416b32ad6645f52d1ae9

diff --git a/macros/db3-check.m4 b/macros/db3-check.m4
index 1d27b433..a9c66325 100644
--- a/macros/db3-check.m4
+++ b/macros/db3-check.m4
@@ -1,4 +1,4 @@
-dnl $Id: db3-check.m4,v 1.20 2009-09-03 08:35:15 franklahm Exp $
+dnl $Id: db3-check.m4,v 1.21 2009-12-13 11:59:11 franklahm Exp $
 dnl Autoconf macros to check for the Berkeley DB library
 
 dnl -- check header for minimum version and return version in
@@ -86,6 +86,13 @@ AC_DEFUN([AC_PATH_BDB],[
     bdb_search_dirs="/usr/local /usr"
     search_subdirs="/ /db4.7 /db47 /db4.6 /db46 /db4.5 /db45 /db4.4 /db44 /db4"
 
+    bdbfound=no
+    savedcflags="$CFLAGS"
+    savedldflags="$LDFLAGS"
+    savedcppflags="$CPPFLAGS"
+    savedlibs="$LIBS"
+    saved_shlibpath_var=$shlibpath_var
+
     dnl required BDB version: 4.6, because of cursor API change
     DB_MAJOR_REQ=4
     DB_MINOR_REQ=6
@@ -93,6 +100,7 @@ AC_DEFUN([AC_PATH_BDB],[
 
     dnl make sure atalk_libname is defined beforehand
     [[ -n "$atalk_libname" ]] || AC_MSG_ERROR([internal error, atalk_libname undefined])
+    saved_atalk_libname=$atalk_libname
 
     dnl define the required BDB version
     AC_DEFINE_UNQUOTED(DB_MAJOR_REQ, ${DB_MAJOR_REQ}, [Required BDB version, major])
@@ -107,16 +115,10 @@ AC_DEFUN([AC_PATH_BDB],[
             dobdbsearch=yes
         else
             bdb_search_dirs="$withval"
+            atalk_libname=lib
         fi
     )
 
-    bdbfound=no
-    savedcflags="$CFLAGS"
-    savedldflags="$LDFLAGS"
-    savedcppflags="$CPPFLAGS"
-    savedlibs="$LIBS"
-    saved_shlibpath_var=$shlibpath_var
-
     if test "x$dobdbsearch" = "xyes"; then
         for bdbdir in $bdb_search_dirs; do
             if test $bdbfound = "yes"; then
@@ -172,6 +174,7 @@ AC_DEFUN([AC_PATH_BDB],[
     LDFLAGS="$savedldflags"
     CPPFLAGS="$savedcppflags"
     LIBS="$savedlibs"
+    atalk_libname=$saved_atalk_libname
 
     if test "x$bdbfound" = "xyes"; then
         ifelse([$1], , :, [$1])