--- courier-imap-3.0.7-orig/configure.in	2004-08-01 07:08:16.000000000 -0700
+++ courier-imap-3.0.7/configure.in	2004-08-14 16:02:03.856436728 -0700
@@ -11,7 +11,6 @@
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_SYSCONFTOOL
 
 AC_PATH_PROGS(SETENV, env)
 
@@ -132,16 +131,18 @@
 
 if test "$db" != "gdbm"
 then
-
-	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"])
-	))
-
-	AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
-	AC_CHECK_FUNC(db_open, HAVE_BDB=1)
-	AC_CHECK_FUNC(db_env_create, HAVE_BDB=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
+  AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
+  AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
+  AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
+  AC_CHECK_FUNC(db_create, HAVE_BDB=1)
+
 fi
 
 LIBS="$saveLIBS"