--- libgda-1.2.0/configure.in.orig	2005-02-04 14:55:37.264111391 +0000
+++ libgda-1.2.0/configure.in	2005-02-04 14:57:40.495430489 +0000
@@ -157,25 +157,31 @@
 bdbdir=""
 if test $try_bdb = true
 then
-	AC_MSG_CHECKING(for Berkeley DB files)
-	for d in $dir /usr /usr/local
-	do
-		if test -f $d/$lib/libdb.so -a -f $d/include/db.h
+	AC_CHECK_HEADER(db.h, bdb_ok=yes, bdb_ok=no, [])
+	if test $bdb_ok = yes ; then
+		bdbdir=yes
+		BDB_LIBS="-ldb"
+	else
+		AC_MSG_CHECKING(for Berkeley DB files)
+		for d in $dir /usr /usr/local
+		do
+			if test -f $d/$lib/libdb.so -a -f $d/include/db.h
+			then
+				AC_MSG_RESULT(found Berkeley DB in $d)
+				bdblib="-ldb"
+				bdbdir=$d
+				break
+			fi
+			dnl FIXME: check for db1 (non-sleepycat implementation)
+		done
+		if test x$bdbdir = x
 		then
-			AC_MSG_RESULT(found Berkeley DB in $d)
-			bdblib="-ldb"
-			bdbdir=$d
-			break
+			AC_MSG_WARN(Berkeley DB backend not used)
+		else
+			AC_DEFINE(HAVE_BDB, 1, [Have Berkeley DB])
+			BDB_CFLAGS="-I${bdbdir}/include"
+			BDB_LIBS="-L${bdbdir}/lib ${bdblib}"
 		fi
-		dnl FIXME: check for db1 (non-sleepycat implementation)
-	done
-	if test x$bdbdir = x
-	then
-		AC_MSG_WARN(Berkeley DB backend not used)
-	else
-		AC_DEFINE(HAVE_BDB, 1, [Have Berkeley DB])
-		BDB_CFLAGS="-I${bdbdir}/include"
-		BDB_LIBS="-L${bdbdir}/lib ${bdblib}"
 	fi
 fi