X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fdb3-check.m4;h=b036882bf2076e675f13f05c313dcee2c9fc5c87;hb=9910b2f7aaa17e65ad2405bf223150f65c2763c2;hp=120fd485cb140f2f8b3ce2b2297ea4f0d18b5e75;hpb=621e94a517b8af44cf8eebb142a4bc9cc55dedc0;p=netatalk.git

diff --git a/macros/db3-check.m4 b/macros/db3-check.m4
index 120fd485..b036882b 100644
--- a/macros/db3-check.m4
+++ b/macros/db3-check.m4
@@ -1,30 +1,39 @@
-dnl $Id: db3-check.m4,v 1.7 2002-02-07 05:08:36 jmarcus Exp $
-dnl Autoconf macro to check for the Berkeley DB3 library
+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_DB3], [
-	trydb3dir=""
-	AC_ARG_WITH(db3,
-		[  --with-db3=PATH         specify path to Berkeley DB3 installation],
+AC_DEFUN([AC_PATH_BDB], [
+	trybdbdir=""
+	AC_ARG_WITH(bdb,
+		[  --with-bdb=PATH         specify path to Berkeley DB installation],
 		if test "x$withval" != "xno"; then
-			trydb3dir="$withval"
+			trybdbdir="$withval"
 		fi
 	)
 
-	db3found=no
-	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/'`"
+	bdbfound=no
+	for bdbdir in "" "$trybdbdir" "$trybdbdir/include" "$trybdbdir/include/db3" "/usr/local/BerkeleyDB.3.3/include" "/usr/local/include/db3" "/usr/local/include" "/usr/include/db3" "/usr/include" ; do
+		if test -f "$bdbdir/db.h" ; then
+			bdblibdir="`echo $bdbdir | sed 's/include\/db3$/lib/'`"
+			bdblibdir="`echo $bdblibdir | sed 's/include$/lib/'`"
+			bdbbindir="`echo $bdbdir | sed 's/include\/db3$/bin/'`"
+			bdbbindir="`echo $bdbbindir | sed 's/include$/bin/'`"
 
 			savedcflags="$CFLAGS"
 			savedldflags="$LDFLAGS"
-			CFLAGS="$CFLAGS -I$db3dir"
-			LDFLAGS="-L$db3libdir $LDFLAGS"
+			CFLAGS="$CFLAGS -I$bdbdir"
+			LDFLAGS="-L$bdblibdir $LDFLAGS"
 			AC_CHECK_LIB(db, main, [
-				db3found=yes
-				DB3_CFLAGS="-I$db3dir"
-				DB3_LIBS="-L$db3libdir -ldb"
-				DB3_PATH="`echo $db3dir | sed 's,include/db3$,,'`"
+				bdbfound=yes
+				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"
@@ -32,13 +41,14 @@ AC_DEFUN([AC_PATH_DB3], [
 		fi
 	done
 
-	if test "x$db3found" = "xyes"; then
+	if test "x$bdbfound" = "xyes"; then
 		ifelse([$1], , :, [$1])
 	else
 		ifelse([$2], , :, [$2])     
 	fi
 
-	AC_SUBST(DB3_CFLAGS)
-	AC_SUBST(DB3_LIBS)
-	AC_SUBST(DB3_PATH)
+	AC_SUBST(BDB_CFLAGS)
+	AC_SUBST(BDB_LIBS)
+	AC_SUBST(BDB_BIN)
+	AC_SUBST(BDB_PATH)
 ])