--- courier-imap-3.0.7-orig/bdbobj/configure.in	2001-09-18 18:26:28.000000000 -0700
+++ courier-imap-3.0.7/bdbobj/configure.in	2004-08-14 16:15:08.469316646 -0700
@@ -21,15 +21,19 @@
 dnl Checks for libraries.
 
 saveLIBS="$LIBS"
-AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
-	AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
-	AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
-	))
-
-FOUND_DB=0
-AC_CHECK_FUNC(dbopen, FOUND_DB=1)
-AC_CHECK_FUNC(db_open, FOUND_DB=1)
-AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
+for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
+  do
+        AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
+          AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
+            AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
+              AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
+
+  done
+FOUND_DB=0
+AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
+AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
+AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
+AC_CHECK_FUNC(db_create, FOUND_DB=1)
 
 LIBS="$saveLIBS"