Tomas Hozza b74606
diff -up bind-9.10.1b1/contrib/dlz/config.dlz.in.64bit bind-9.10.1b1/contrib/dlz/config.dlz.in
Tomas Hozza b74606
--- bind-9.10.1b1/contrib/dlz/config.dlz.in.64bit	2014-06-23 06:47:35.000000000 +0200
Tomas Hozza b74606
+++ bind-9.10.1b1/contrib/dlz/config.dlz.in	2014-07-29 15:29:06.956527598 +0200
Adam Tkac e93ead
@@ -17,6 +17,13 @@
Adam Tkac e93ead
 #
Adam Tkac e93ead
 dlzdir='${DLZ_DRIVER_DIR}'
Adam Tkac e93ead
 
Adam Tkac e93ead
+AC_MSG_CHECKING([for target libdir])
Adam Tkac e93ead
+AC_RUN_IFELSE([int main(void) {exit((sizeof(void *) == 8) ? 0 : 1);}],
Adam Tkac e93ead
+	[target_lib=lib64],
Adam Tkac e93ead
+	[target_lib=lib],
Adam Tkac e93ead
+)
Adam Tkac e93ead
+AC_MSG_RESULT(["$target_lib"])
Adam Tkac e93ead
+
Adam Tkac e93ead
 #
Adam Tkac e93ead
 # Private autoconf macro to simplify configuring drivers:
Adam Tkac e93ead
 #
Tomas Hozza b74606
@@ -140,9 +147,9 @@ then
Adam Tkac e93ead
 		then
Adam Tkac 3471a1
 			use_dlz_mysql=$d
Adam Tkac 3471a1
 			mysql_include=$d/include/mysql
Adam Tkac 3471a1
-			if test -d $d/lib/mysql
Adam Tkac 3471a1
+			if test -d $d/${target_lib}/mysql
Adam Tkac 3471a1
 			then
Adam Tkac 3471a1
-				mysql_lib=$d/lib/mysql
Adam Tkac 3471a1
+				mysql_lib=$d/${target_lib}/mysql
Adam Tkac 3471a1
 			else
Adam Tkac 3471a1
 				mysql_lib=$d/lib
Adam Tkac 3471a1
 			fi
Tomas Hozza b74606
@@ -288,9 +295,9 @@ case "$use_dlz_bdb" in
Adam Tkac 0e5b5a
 					then
Tomas Hozza b74606
 						break
Adam Tkac 0e5b5a
 					fi
Tomas Hozza b74606
-				elif test -f "$dd/lib/lib${d}.so"
Tomas Hozza b74606
+				elif test -f "$dd/${target_lib}/lib${d}.so"
Tomas Hozza b74606
 				then
Tomas Hozza b74606
-					dlz_bdb_libs="-L${dd}/lib -l${d}"
Tomas Hozza b74606
+					dlz_bdb_libs="-L${dd}/${target_lib} -l${d}"
Tomas Hozza b74606
 					break
Tomas Hozza b74606
 				fi
Tomas Hozza b74606
 			done
Tomas Hozza b74606
@@ -390,7 +397,7 @@ case "$use_dlz_ldap" in
Adam Tkac e93ead
 	*)
Adam Tkac e93ead
 		DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver,
Adam Tkac e93ead
 				[-I$use_dlz_ldap/include],
Adam Tkac e93ead
-				[-L$use_dlz_ldap/lib -lldap -llber])
Adam Tkac e93ead
+				[-L$use_dlz_ldap/${target_lib} -lldap -llber])
Adam Tkac e93ead
 
Adam Tkac e93ead
 		AC_MSG_RESULT(
Adam Tkac 3471a1
 [using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include])
Tomas Hozza b74606
@@ -425,11 +432,11 @@ then
Tomas Hozza b74606
 		odbcdirs="/usr /usr/local /usr/pkg"
Tomas Hozza b74606
 		for d in $odbcdirs
Tomas Hozza b74606
 		do
Tomas Hozza b74606
-			if test -f $d/include/sql.h -a -f $d/lib/libodbc.a
Tomas Hozza b74606
+			if test -f $d/include/sql.h -a -f $d/${target_lib}/libodbc.a
Tomas Hozza b74606
 			then
Tomas Hozza b74606
 				use_dlz_odbc=$d
Tomas Hozza b74606
 				dlz_odbc_include="-I$use_dlz_odbc/include"
Tomas Hozza b74606
-				dlz_odbc_libs="-L$use_dlz_odbc/lib -lodbc"
Tomas Hozza b74606
+				dlz_odbc_libs="-L$use_dlz_odbc/${target_lib} -lodbc"
Tomas Hozza b74606
 				break
Tomas Hozza b74606
 			fi
Tomas Hozza b74606
 		done