From: Evan Hunt <each@isc.org>
Date: Sat, 5 Nov 2011 05:14:28 +0000 (+0000)
Subject: 3207.	[contrib]	Fixed build error in Berkeley DB DLZ module. [RT #26444]
X-Git-Tag: v9.9.0b2~55
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=5584cbf427d85488e3fbed682ea3f2406bdb8b4f;p=thirdparty%2Fbind9.git

3207.	[contrib]	Fixed build error in Berkeley DB DLZ module. [RT #26444]
---

diff --git a/CHANGES b/CHANGES
index 39f14fbd500..544d1913dbc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3207.	[contrib]	Fixed build error in Berkeley DB DLZ module. [RT #26444]
+
 3206.	[cleanup]	Add ISC information to log at start time. [RT #25484]
 
 3205.	[func]		Upgrade dig's defaults to better reflect modern
diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in
index 0aa34fa8a0f..9d5b8c34986 100644
--- a/contrib/dlz/config.dlz.in
+++ b/contrib/dlz/config.dlz.in
@@ -250,7 +250,7 @@ case "$use_dlz_bdb" in
 			# Check other locations for includes.
 			# Order is important (sigh).
 
-			bdb_incdirs="/ /db42/ /db41/ /db4/ /db/"
+			bdb_incdirs="/ /db48/ /db47/ /db46/ /db45/ /db44/ /db43/ /db42/ /db41/ /db4/ /db/"
 			for d in $bdb_incdirs
 			do
 				if test -f "$dd/include${d}db.h"
@@ -271,7 +271,7 @@ case "$use_dlz_bdb" in
 			# Look for libname other than libdb.so.
 			# Order is important (sigh).
 
-			bdb_libnames="db42 db-4.2 db41 db-4.1 db"
+			bdb_libnames="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 -f "$dd/lib/lib${d}.so"