diff -ruN cyrus-sasl-2.1.20.orig/cmulocal/berkdb.m4 cyrus-sasl-2.1.20/cmulocal/berkdb.m4
--- cyrus-sasl-2.1.20.orig/cmulocal/berkdb.m4	2004-09-14 06:57:17 +0900
+++ cyrus-sasl-2.1.20/cmulocal/berkdb.m4	2005-01-11 21:09:52 +0800
@@ -1,4 +1,4 @@
-dnl $Id: berkdb.m4,v 1.17 2004/09/13 21:57:17 shadow Exp $
+dnl $Id: berkdb.m4,v 1.19 2005/01/06 20:24:52 shadow Exp $
 
 AC_DEFUN([CMU_DB_INC_WHERE1], [
 saved_CPPFLAGS=$CPPFLAGS
@@ -212,13 +212,14 @@
 	fi
 
 	saved_LIBS=$LIBS
-        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-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
           do
 	    LIBS="$saved_LIBS -l$dbname"
 	    AC_TRY_LINK([#include <db.h>],
 	    [db_create(NULL, NULL, 0);],
 	    BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
             dblib="no")
+	    if test "$dblib" = "berkeley"; then break; fi
           done
         if test "$dblib" = "no"; then
 	    LIBS="$saved_LIBS -ldb"