900526
diff -up bind-9.9.0/contrib/dlz/config.dlz.in.64bit bind-9.9.0/contrib/dlz/config.dlz.in
900526
--- bind-9.9.0/contrib/dlz/config.dlz.in.64bit	2011-11-05 06:14:28.000000000 +0100
900526
+++ bind-9.9.0/contrib/dlz/config.dlz.in	2012-04-24 14:52:08.398511143 +0200
900526
@@ -17,6 +17,13 @@
900526
 #
900526
 dlzdir='${DLZ_DRIVER_DIR}'
900526
 
900526
+AC_MSG_CHECKING([for target libdir])
900526
+AC_RUN_IFELSE([int main(void) {exit((sizeof(void *) == 8) ? 0 : 1);}],
900526
+	[target_lib=lib64],
900526
+	[target_lib=lib],
900526
+)
900526
+AC_MSG_RESULT(["$target_lib"])
900526
+
900526
 #
900526
 # Private autoconf macro to simplify configuring drivers:
900526
 #
900526
@@ -135,9 +142,9 @@ then
900526
 		then
900526
 			use_dlz_mysql=$d
900526
 			mysql_include=$d/include/mysql
900526
-			if test -d $d/lib/mysql
900526
+			if test -d $d/${target_lib}/mysql
900526
 			then
900526
-				mysql_lib=$d/lib/mysql
900526
+				mysql_lib=$d/${target_lib}/mysql
900526
 			else
900526
 				mysql_lib=$d/lib
900526
 			fi
900526
@@ -274,11 +281,11 @@ case "$use_dlz_bdb" in
900526
 			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"
900526
 			for d in $bdb_libnames
900526
 			do
900526
-				if test -f "$dd/lib/lib${d}.so"
900526
+				if test -f "$dd/${target_lib}/lib${d}.so"
900526
 				then
900526
 					if test "$dd" != "/usr"
900526
 					then
900526
-						dlz_bdb_libs="-L${dd}/lib "
900526
+						dlz_bdb_libs="-L${dd}/${target_lib} "
900526
 					else
900526
 						dlz_bdb_libs=""
900526
 					fi
900526
@@ -383,7 +390,7 @@ case "$use_dlz_ldap" in
900526
 	*)
900526
 		DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver,
900526
 				[-I$use_dlz_ldap/include],
900526
-				[-L$use_dlz_ldap/lib -lldap -llber])
900526
+				[-L$use_dlz_ldap/${target_lib} -lldap -llber])
900526
 
900526
 		AC_MSG_RESULT(
900526
 [using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include])
900526
@@ -407,7 +414,7 @@ then
900526
 	odbcdirs="/usr /usr/local /usr/pkg"
900526
 	for d in $odbcdirs
900526
 	do
900526
-		if test -f $d/include/sql.h -a -f $d/lib/libodbc.a
900526
+		if test -f $d/include/sql.h -a -f $d/${target_lib}/libodbc.a
900526
 		then
900526
 			use_dlz_odbc=$d
900526
 			break
900526
@@ -427,7 +434,7 @@ case "$use_dlz_odbc" in
900526
 	*)
900526
 		DLZ_ADD_DRIVER(ODBC, dlz_odbc_driver,
900526
 				[-I$use_dlz_odbc/include],
900526
-				[-L$use_dlz_odbc/lib -lodbc])
900526
+				[-L$use_dlz_odbc/${target_lib} -lodbc])
900526
 
900526
 		AC_MSG_RESULT([using ODBC from $use_dlz_odbc])
900526
 		;;