]>
Commit | Line | Data |
---|---|---|
ebcd2820 | 1 | diff -urN aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4 cyrus-sasl-2.1.22/cmulocal/berkdb.m4 |
2 | --- aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4 2005-04-26 21:14:07.000000000 +0200 | |
3 | +++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4 2006-10-02 20:36:17.137852392 +0200 | |
4 | @@ -213,7 +213,7 @@ | |
5 | fi | |
6 | ||
7 | saved_LIBS=$LIBS | |
8 | - 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 | |
b90c0a63 | 9 | + for dbname in db-5.0 db-4.8 db-4.7 db-4.6 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 |
ebcd2820 | 10 | do |
11 | LIBS="$saved_LIBS -l$dbname" | |
12 | AC_TRY_LINK([#include <db.h>], | |
b90c0a63 JB |
13 | --- cyrus-sasl-2.1.23/sasldb/db_berkeley.c.orig 2009-04-28 17:09:18.000000000 +0200 |
14 | +++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c 2010-05-18 21:02:20.418940098 +0200 | |
15 | @@ -100,7 +100,7 @@ | |
16 | ret = db_create(mbdb, NULL, 0); | |
17 | if (ret == 0 && *mbdb != NULL) | |
18 | { | |
19 | -#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 | |
20 | +#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) | |
21 | ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); | |
22 | #else | |
23 | ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); | |
398a5ae5 JB |
24 | --- cyrus-sasl-2.1.23/utils/dbconverter-2.c.orig 2003-02-13 20:56:17.000000000 +0100 |
25 | +++ cyrus-sasl-2.1.23/utils/dbconverter-2.c 2010-05-18 21:11:09.982932556 +0200 | |
26 | @@ -214,7 +214,7 @@ | |
27 | ret = db_create(mbdb, NULL, 0); | |
28 | if (ret == 0 && *mbdb != NULL) | |
29 | { | |
30 | -#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 | |
31 | +#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) | |
32 | ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); | |
33 | #else | |
34 | ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); |