Tomas Hozza 1a8c6b
diff -up bind-9.9.4/contrib/dlz/config.dlz.in.libdb bind-9.9.4/contrib/dlz/config.dlz.in
Tomas Hozza 1a8c6b
--- bind-9.9.4/contrib/dlz/config.dlz.in.libdb	2014-01-06 13:24:24.669256364 +0100
Tomas Hozza 1a8c6b
+++ bind-9.9.4/contrib/dlz/config.dlz.in	2014-01-06 13:26:29.861420493 +0100
Tomas Hozza c45bcb
@@ -257,7 +257,7 @@ case "$use_dlz_bdb" in
Tomas Hozza c45bcb
 			# Check other locations for includes.
Tomas Hozza c45bcb
 			# Order is important (sigh).
Tomas Hozza c45bcb
 
Tomas Hozza c45bcb
-			bdb_incdirs="/ /db48/ /db47/ /db46/ /db45/ /db44/ /db43/ /db42/ /db41/ /db4/ /db/"
Tomas Hozza 1a8c6b
+			bdb_incdirs="/ /db48/ /db47/ /db46/ /db45/ /db44/ /db43/ /db42/ /db41/ /db4/ /libdb/ /db/"
Tomas Hozza c45bcb
 			for d in $bdb_incdirs
Tomas Hozza c45bcb
 			do
Tomas Hozza c45bcb
 				if test -f "$dd/include${d}db.h"
Tomas Hozza 1a8c6b
@@ -283,13 +283,7 @@ case "$use_dlz_bdb" in
Tomas Hozza 242146
 			do
Tomas Hozza 1a8c6b
 				if test -f "$dd/${target_lib}/lib${d}.so"
Tomas Hozza 242146
 				then
Tomas Hozza f992a0
-					if test "$dd" != "/usr"
Tomas Hozza f992a0
-					then
Tomas Hozza 242146
-						dlz_bdb_libs="-L${dd}/${target_lib} "
Tomas Hozza f992a0
-					else
Tomas Hozza f992a0
-						dlz_bdb_libs=""
Tomas Hozza f992a0
-					fi
Tomas Hozza f992a0
-					dlz_bdb_libs="${dlz_bdb_libs}-l${d}"
Tomas Hozza 1a8c6b
+					dlz_bdb_libs="-L${dd}/${target_lib}/libdb -l${d}"
Tomas Hozza f992a0
 					break
Tomas Hozza f992a0
 				fi
Tomas Hozza f992a0
 			done