X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cyrus-sasl-db.patch;h=ce9f264937b78763bb60d47865ce863d4d2e5c20;hb=refs%2Ftags%2Fauto%2Fti%2Fcyrus-sasl-2.1.26-2;hp=83c40aadeffe9b636bef26c9b17eb2f8f18c76e3;hpb=ebcd282081444c9515c7b71650fe2a5c288918ea;p=packages%2Fcyrus-sasl.git

diff --git a/cyrus-sasl-db.patch b/cyrus-sasl-db.patch
index 83c40aa..ce9f264 100644
--- a/cyrus-sasl-db.patch
+++ b/cyrus-sasl-db.patch
@@ -1,12 +1,10 @@
-diff -urN aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4 cyrus-sasl-2.1.22/cmulocal/berkdb.m4
---- aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4	2005-04-26 21:14:07.000000000 +0200
-+++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4	2006-10-02 20:36:17.137852392 +0200
-@@ -213,7 +213,7 @@
- 	fi
+--- cyrus-sasl-2.1.26/cmulocal/berkdb.m4.orig	2012-11-23 18:30:01.142069119 +0100
++++ cyrus-sasl-2.1.26/cmulocal/berkdb.m4	2012-11-23 18:31:46.428733592 +0100
+@@ -214,6 +214,7 @@
  
  	saved_LIBS=$LIBS
--        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
-+        for dbname in db-4.5 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>],
+ 	    for dbname in ${with_bdb} \
++		db-5.3 db5.3 db53 \
+ 	        db-5.2 db5.2 db52 \
+ 	        db-5.1 db5.2 db51 \
+ 	        db-5.0 db5.2 db50 \