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