[Patch] GConf head branch db3 patch



Hi,

	Attached a patch which enables libdb-3.3, 3.2 and 3.1 detection
in addition to db-3. Is it ok to commit?

TIA!

Abel
--- GConf-1.1.3/configure.in.db3	Mon Oct 15 01:29:51 2001
+++ GConf-1.1.3/configure.in	Mon Oct 29 20:44:33 2001
@@ -172,11 +172,9 @@
 	CFLAGS_save="$CFLAGS"
 	LIBS_save="$LDFLAGS"
 	
-	db3libs="-ldb-3"
 	AC_CACHE_CHECK([for DB3 libraries], db3_libs,
 	[
-		CFLAGS="$CFLAGS $NSPR_CFLAGS"
-		
+	    for db3libs in "-ldb-3.3" "-ldb-3.2" "-ldb-3.1" "-ldb-3"; do
 		if test "x${with_db3_libs}" != "x"; then
 			LIBS="$LIBS -L$with_db3_libs $db3libs"
 		else
@@ -186,10 +184,15 @@
 		AC_TRY_LINK_FUNC(db_env_create, db3_libs="yes", db3_libs="no")
 		CFLAGS="$CFLAGS_save"
 		LIBS="$LIBS_save"
+
+		if test "$db3_libs" = "yes"; then
+			break
+		fi
+	    done
 	])
 	if test "x${db3_libs}" != "xno"; then
 		have_db3_libs="yes"
-		BDB_LIBS="-L$with_db3_libs $nsprlibs"
+		BDB_LIBS="-L$with_db3_libs $db3libs"
 	else
 		BDB_LIBS=""
 	fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]