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