$OpenBSD: patch-configure,v 1.10 2010/06/14 05:45:32 ajacoutot Exp $
--- configure.orig	Fri Jun 11 22:41:05 2010
+++ configure	Mon Jun 14 07:25:19 2010
@@ -18887,7 +18887,6 @@ fi
 
 
 case $host_cpu in
-x86_64* | sparc64* | s390x* | ppc64* | powerpc64* ) lib="lib64";;
 *) lib="lib";;
 esac
 
@@ -18944,7 +18943,6 @@ $as_echo "#define HAVE_BDB 1" >>confdefs.h
 				BDB_LIBS="-L${bdbdir}/bin -ldb47"
 				break
 			fi
-
 			if test $platform_win32 = no -a -f $d/include/db.h -a -f $d/$lib/libdb$linklibext
 			then
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found Berkeley DB in $d" >&5
@@ -18958,8 +18956,7 @@ $as_echo "#define HAVE_BDB 1" >>confdefs.h
 				BDB_LIBS="-L${bdbdir}/${lib} -ldb"
 				break
 			fi
-			if test $platform_win32 = no -a -f $d/include/db.h -a -f $d/lib/libdb$linklibext
-			then
+			if [ $platform_win32 == "no" ]; then
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found Berkeley DB in $d" >&5
 $as_echo "found Berkeley DB in $d" >&6; }
 
@@ -19019,7 +19016,7 @@ then
 $as_echo_n "checking for ODBC files... " >&6; }
 	for d in $dir /usr /usr/local
 	do
-		if test -f $d/$lib/libodbc$linklibext -a -f $d/include/sql.h
+		if test -f $d/$lib/libodbc$linklibext* -a -f $d/include/sql.h
 		then
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found ODBC in $d" >&5
 $as_echo "found ODBC in $d" >&6; }
