--- configure.orig	Tue Sep  2 06:39:30 2003
+++ configure	Wed Oct 22 15:23:46 2003
@@ -5826,36 +5826,9 @@
 	    done
         done
     fi
-    if test x"$BERKELEY_DB_DIR" = xyes ; then
-        for v in db41 db4 db3 db2 ; do
-            if test -d "/usr/local/include/$v" ; then
-                BERKELEY_DB_LDFLAGS="-L/usr/local/lib"
-                BERKELEY_DB_CFLAGS="-I/usr/local/include/$v"
-                BERKELEY_DB_LIB="-l$v"
-                echo "$ac_t""FreeBSD locations" 1>&6
-                break
-            fi
-        done
-        if test x"$BERKELEY_DB_LIB" = x ; then
-            for v in db41 db4 db3 db2 ; do
-                if test -d "/usr/include/$v" ; then
-                    BERKELEY_DB_CFLAGS="-I/usr/include/$v"
-                    BERKELEY_DB_LIB="-l$v"
-                    echo "$ac_t""Linux locations" 1>&6
-                    break
-                fi
-            done
-            if test x"$BERKELEY_DB_LIB" = x ; then        
-                BERKELEY_DB_LIB=-ldb
-                echo "$ac_t""trying -ldb" 1>&6
-            fi
-        fi
-    else
         BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib"
-        BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
-        BERKELEY_DB_LIB="-ldb"
-        echo "$ac_t""$BERKELEY_DB_DIR" 1>&6
-    fi
+        BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/${DB_VER}"
+        BERKELEY_DB_LIB="-l${DB_VER}"
     cat >> confdefs.h <<\EOF
 #define USE_BERKELEY_DB 1
 EOF