--- ../spamprobe-0.9h.orig/configure.in	2004-02-02 19:09:43.000000000 +0100
+++ configure.in	2004-09-07 18:17:17.649613344 +0200
@@ -68,25 +68,45 @@
     [
       AC_EGREP_HEADER([DB_VERSION_MAJOR *3|4], [db.h],,
         AC_MSG_ERROR([No suitable BerkeleyDB db.h header file found.
-  Use --with-db=PATH to specify the path to a version 3 or later install directory.
+  Use --with-db=PATH to specify the path to a version 3 or later install header directory.
   You can download BerkeleyDB from http://www.sleepycat.com])
       )
     ]
   )
   AC_TRY_LINK_FUNC(db_create,,
-    AC_CHECK_LIB(db-4, db_create, LIBS="$LIBS -ldb-4",
-      AC_CHECK_LIB(db-3, db_create, LIBS="$LIBS -ldb-3",
-        AC_CHECK_LIB(db-2, db_create, LIBS="$LIBS -ldb-2",
-          AC_CHECK_LIB(db, db_create, LIBS="$LIBS -ldb",
-            AC_CHECK_LIB(db3, db_create, LIBS="$LIBS -ldb3",
-              AC_CHECK_LIB(db-3.1, db_create, LIBS="$LIBS -ldb-3.1",
-                AC_CHECK_LIB(db4, db_create, LIBS="$LIBS -ldb4",
+    AC_CHECK_LIB(db-4, db_create_4000, LIBS="$LIBS -ldb-4",
+      AC_CHECK_LIB(db-4.2, db_create_4002, LIBS="$LIBS -ldb-4.2",
+        AC_CHECK_LIB(db-4.1, db_create_4001, LIBS="$LIBS -ldb-4.1",
+          AC_CHECK_LIB(db-3, db_create, LIBS="$LIBS -ldb-3",
+            AC_CHECK_LIB(db-2, db_create, LIBS="$LIBS -ldb-2",
+              AC_CHECK_LIB(db, db_create, LIBS="$LIBS -ldb",
+                AC_CHECK_LIB(db3, db_create, LIBS="$LIBS -ldb3",
                   AC_MSG_ERROR([No suitable BerkeleyDB library found.
   Use --with-db=PATH to specify the path to a version 3 or later install directory.
   You can download BerkeleyDB from http://www.sleepycat.com])))))))))
   AC_MSG_CHECKING(BerkeleyDB)
-  AC_TRY_LINK_FUNC(db_create, AC_DEFINE([USE_DB]) have_database=1)
-  AC_MSG_RESULT(ok)
+
+  if test $LIBS = "-ldb4"; then  
+    AC_TRY_LINK_FUNC(db_create_4000, AC_DEFINE([USE_DB]) have_database=1)
+    AC_MSG_CHECKING(Using db_create_4000)
+    AC_MSG_RESULT(ok)
+  else
+    if test $LIBS = "-ldb-4.2"; then
+      AC_TRY_LINK_FUNC(db_create_4002, AC_DEFINE([USE_DB]) have_database=1)
+      AC_MSG_CHECKING(Using db_create_4002)
+      AC_MSG_RESULT(ok, Using db_create_4002)
+    else 
+        if test $LIBS = "-ldb-4.1"; then
+          AC_TRY_LINK_FUNC(db_create_4001, AC_DEFINE([USE_DB]) have_database=1)
+          AC_MSG_CHECKING(Using db_create_4001)
+          AC_MSG_RESULT(ok, Using db_create_4001)
+        else  
+          AC_TRY_LINK_FUNC(db_create, AC_DEFINE([USE_DB]) have_database=1)
+          AC_MSG_CHECKING(Using db_create)
+          AC_MSG_RESULT(ok, Using db_create)
+        fi
+    fi
+  fi
 fi
 
 if test $have_database = 0 ; then