--- cyrus-imapd.orig/configure.in	Wed Feb 21 11:57:33 2001
+++ cyrus-imapd/configure.in	Tue Mar 20 09:50:12 2001
@@ -115,16 +115,27 @@
   else
     CPPFLAGS="-I$withval/include $CPPFLAGS"
   fi,
-  # otherwise, check for /usr/include/db3
-  if test -d /usr/include/db3; then
-    CPPFLAGS="-I/usr/include/db3 $CPPFLAGS"
-  fi)
-AC_CHECK_LIB(db-3, db_create, [AC_DEFINE(HAVE_LIBDB)
-       	                       LIBS=" -ldb-3 ${LIBS}"],
-  AC_CHECK_LIB(db, db_create, [AC_DEFINE(HAVE_LIBDB)
-			       LIBS="-ldb ${LIBS}"],
-    AC_ERROR([this version requires Berkeley DB 3.x.
-(Get it from http://www.sleepycat.com/.)])))
+  # otherwise, check for ../include/db3
+  for db3loc in $prefix /usr/local /usr
+    do
+      if test -d $db3loc/include/db3; then
+	CPPFLAGS="-I$db3loc/include/db3 $CPPFLAGS"
+	break
+      fi
+    done)
+#Try to detect the name of the DB3 library
+dbfound="no"
+for dbname in db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
+  do
+    AC_CHECK_LIB($dbname, db_create, [AC_DEFINE(HAVE_LIBDB)
+				      LIBS=" -l$dbname ${LIBS}"
+				      dbfound="yes"
+				      break], dbfound="no")
+  done
+if test "$dbfound" = "no"; then
+  AC_ERROR([this version requires Berkeley DB 3.x.
+(Get it from http://www.sleepycat.com/.)])
+fi
 
 sievedir="sieve"
 AC_ARG_ENABLE(sieve,