a2a915
diff -up bind-9.10.1b1/contrib/dlz/config.dlz.in.libdb bind-9.10.1b1/contrib/dlz/config.dlz.in
a2a915
--- bind-9.10.1b1/contrib/dlz/config.dlz.in.libdb	2014-08-04 12:33:09.320735111 +0200
a2a915
+++ bind-9.10.1b1/contrib/dlz/config.dlz.in	2014-08-04 12:41:46.888241910 +0200
a2a915
@@ -263,7 +263,7 @@ case "$use_dlz_bdb" in
a2a915
 			# Check other locations for includes.
a2a915
 			# Order is important (sigh).
a2a915
 
a2a915
-			bdb_incdirs="/db53 /db51 /db48 /db47 /db46 /db45 /db44 /db43 /db42 /db41 /db4 /db"
a2a915
+			bdb_incdirs="/db53 /db51 /db48 /db47 /db46 /db45 /db44 /db43 /db42 /db41 /db4 /libdb /db"
a2a915
 			# include a blank element first
a2a915
 			for d in "" $bdb_incdirs
a2a915
 			do
a2a915
@@ -288,16 +288,9 @@ case "$use_dlz_bdb" in
a2a915
 			bdb_libnames="db53 db-5.3 db51 db-5.1 db48 db-4.8 db47 db-4.7 db46 db-4.6 db45 db-4.5 db44 db-4.4 db43 db-4.3 db42 db-4.2 db41 db-4.1 db"
a2a915
 			for d in $bdb_libnames
a2a915
 			do
a2a915
-				if test "$dd" = "/usr"
a2a915
+				if test -f "$dd/${target_lib}/lib${d}.so"
a2a915
 				then
a2a915
-					AC_CHECK_LIB($d, db_create, dlz_bdb_libs="-l${d}")
a2a915
-					if test $dlz_bdb_libs != "yes"
a2a915
-					then
a2a915
-						break
a2a915
-					fi
a2a915
-				elif test -f "$dd/${target_lib}/lib${d}.so"
a2a915
-				then
a2a915
-					dlz_bdb_libs="-L${dd}/${target_lib} -l${d}"
a2a915
+					dlz_bdb_libs="-L${dd}/${target_lib}/libdb -l${d}"
a2a915
 					break
a2a915
 				fi
a2a915
 			done