--- contrib/dlz/config.dlz.in	2008-06-17 05:54:30.000000000 +0200
+++ contrib/dlz/config.dlz.in.oden	2008-10-09 14:46:44.000000000 +0200
@@ -17,6 +17,13 @@
 #
 dlzdir='${DLZ_DRIVER_DIR}'
 
+AC_MSG_CHECKING([for target libdir])
+AC_RUN_IFELSE([int main(void) {exit((sizeof(void *) == 8) ? 0 : 1);}],
+	[target_lib=lib64],
+	[target_lib=lib],
+)
+AC_MSG_RESULT(["$target_lib"])
+
 #
 # Private autoconf macro to simplify configuring drivers:
 #
@@ -83,7 +90,7 @@
 		if test -f $d/include/libpq-fe.h
 		then
 			use_dlz_postgres=$d/include
-			use_dlz_postgres_lib=$d/lib
+			use_dlz_postgres_lib=$d/${target_lib}
 			break
 		fi
 	done
@@ -135,22 +142,22 @@
 		then
 			use_dlz_mysql=$d
 			mysql_include=$d/include/mysql
-			if test -d $d/lib/mysql
+			if test -d $d/${target_lib}/mysql
 			then
-				mysql_lib=$d/lib/mysql
+				mysql_lib=$d/${target_lib}/mysql
 			else
-				mysql_lib=$d/lib
+				mysql_lib=$d/${target_lib}
 			fi
 			break
 		elif test -f $d/include/mysql.h
 		then
 			use_dlz_mysql=$d
 			mysql_include=$d/include
-			if test -d $d/lib/mysql
+			if test -d $d/${target_lib}/mysql
 			then
-				mysql_lib=$d/lib/mysql
+				mysql_lib=$d/${target_lib}/mysql
 			else
-				mysql_lib=$d/lib
+				mysql_lib=$d/${target_lib}
 			fi
 			break
 		fi
@@ -161,20 +168,20 @@
 	if test -f $d/include/mysql/mysql.h
 	then
 		mysql_include=$d/include/mysql
-		if test -d $d/lib/mysql
+		if test -d $d/${target_lib}/mysql
 		then
-			mysql_lib=$d/lib/mysql
+			mysql_lib=$d/${target_lib}/mysql
 		else
-			mysql_lib=$d/lib
+			mysql_lib=$d/${target_lib}
 		fi
 	elif test -f $d/include/mysql.h
 	then
 		mysql_include=$d/include
-		if test -d $d/lib/mysql
+		if test -d $d/${target_lib}/mysql
 		then
-			mysql_lib=$d/lib/mysql
+			mysql_lib=$d/${target_lib}/mysql
 		else
-			mysql_lib=$d/lib
+			mysql_lib=$d/${target_lib}
 		fi
 	fi
 fi
@@ -274,11 +281,11 @@
 			bdb_libnames="db42 db-4.2 db41 db-4.1 db"
 			for d in $bdb_libnames
 			do
-				if test -f "$dd/lib/lib${d}.so"
+				if test -f "$dd/${target_lib}/lib${d}.so"
 				then
 					if test "$dd" != "/usr"
 					then
-						dlz_bdb_libs="-L${dd}/lib "
+						dlz_bdb_libs="-L${dd}/${target_lib} "
 					else
 						dlz_bdb_libs=""
 					fi
@@ -383,10 +390,10 @@
 	*)
 		DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver,
 				[-I$use_dlz_ldap/include],
-				[-L$use_dlz_ldap/lib -lldap -llber])
+				[-L$use_dlz_ldap/${target_lib} -lldap -llber])
 
 		AC_MSG_RESULT(
-[using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include])
+[using LDAP from $use_dlz_ldap/${target_lib} and $use_dlz_ldap/include])
 		;;
 esac
 
@@ -407,7 +414,7 @@
 	odbcdirs="/usr /usr/local /usr/pkg"
 	for d in $odbcdirs
 	do
-		if test -f $d/include/sql.h -a -f $d/lib/libodbc.a
+		if test -f $d/include/sql.h -a -f $d/${target_lib}/libodbc.a
 		then
 			use_dlz_odbc=$d
 			break
@@ -427,7 +434,7 @@
 	*)
 		DLZ_ADD_DRIVER(ODBC, dlz_odbc_driver,
 				[-I$use_dlz_odbc/include],
-				[-L$use_dlz_odbc/lib -lodbc])
+				[-L$use_dlz_odbc/${target_lib} -lodbc])
 
 		AC_MSG_RESULT([using ODBC from $use_dlz_odbc])
 		;;