X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fdb3-check.m4;h=d2b4778c92e082636ccfda815637a37b55dce94b;hb=9b2b3c5ca60b00ac791aeb6e73f254a4a2f4880d;hp=8129ef24f05aa4c7d45a2f78887f11579fba580e;hpb=5d92ef1a497493e0b0d96fdd5f6b2c664e6d0228;p=netatalk.git

diff --git a/macros/db3-check.m4 b/macros/db3-check.m4
index 8129ef24..d2b4778c 100644
--- a/macros/db3-check.m4
+++ b/macros/db3-check.m4
@@ -1,4 +1,4 @@
-dnl $Id: db3-check.m4,v 1.3 2001-11-14 22:36:35 jmarcus Exp $
+dnl $Id: db3-check.m4,v 1.6 2001-11-16 21:51:05 jnewman Exp $
 dnl Autoconf macro to check for the Berkeley DB3 library
 
 AC_DEFUN([AC_PATH_DB3], [
@@ -11,7 +11,7 @@ AC_DEFUN([AC_PATH_DB3], [
 	)
 
 	db3found=no
-	for db3dir in "" "$trydb3dir" "$trydb3dir/include" "$trydb3dir/include/db3" "/usr/include" "/usr/local/BerkeleyDB.3.3/include" "/usr/include/db3" "/usr/local/include" "/usr/local/include/db3" ; do
+	for db3dir in "" "$trydb3dir" "$trydb3dir/include" "$trydb3dir/include/db3" "/usr/local/BerkeleyDB.3.3/include" "/usr/local/include/db3" "/usr/local/include" "/usr/include/db3" "/usr/include" ; do
 		if test -f "$db3dir/db.h" ; then
 			db3libdir="`echo $db3dir | sed 's/include\/db3$/lib/'`"
 			db3libdir="`echo $db3libdir | sed 's/include$/lib/'`"
@@ -19,11 +19,11 @@ AC_DEFUN([AC_PATH_DB3], [
 			savedcflags="$CFLAGS"
 			savedldflags="$LDFLAGS"
 			CFLAGS="$CFLAGS -I$db3dir"
-			LDFLAGS="$LDFLAGS -L$db3libdir"
-			AC_CHECK_LIB(db3, main, [
+			LDFLAGS="-L$db3libdir $LDFLAGS"
+			AC_CHECK_LIB(db, main, [
 				db3found=yes
 				DB3_CFLAGS="-I$db3dir"
-				DB3_LIBS="-L$db3libdir -ldb3"
+				DB3_LIBS="-L$db3libdir -ldb"
 			])
 			CFLAGS="$savedcflags"
 			LDFLAGS="$savedldflags"