1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
diff -urN cyrus-sasl-2.1.14/cmulocal/berkdb.m4 cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4
--- cyrus-sasl-2.1.14/cmulocal/berkdb.m4 2003-04-15 17:25:41.000000000 -0500
+++ cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4 2003-07-09 03:17:48.000000000 -0500
@@ -211,12 +211,20 @@
BDB_LIBADD=""
fi
- for dbname in 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.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
do
- AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
- dblib="berkeley"; break, dblib="no")
+ AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname";
+ dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname";
+ dblib="berkeley"; break, dblib="no"))
done
if test "$dblib" = "no"; then
+ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
+ do
+ AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
+ dblib="berkeley"; break, dblib="no")
+ done
+ fi
+ if test "$dblib" = "no"; then
AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb";
dblib="berkeley"; dbname=db,
dblib="no")
diff -urN cyrus-sasl-2.1.14/cmulocal/sasl2.m4 cyrus-sasl-2.1.14-modified/cmulocal/sasl2.m4
--- cyrus-sasl-2.1.14/cmulocal/sasl2.m4 2003-05-14 13:36:41.000000000 -0500
+++ cyrus-sasl-2.1.14-modified/cmulocal/sasl2.m4 2003-07-09 03:18:31.000000000 -0500
@@ -25,8 +25,9 @@
dnl
dnl The choice is reflected in GSSAPIBASE_LIBS
dnl we might need libdb
- AC_CHECK_LIB(db, db_open)
-
+ AC_CHECK_LIB(db, db_open,,
+ AC_CHECK_LIB(db, db_open_4001,,
+ AC_CHECK_LIB(db, db_open_4000)))
gss_impl="mit";
AC_CHECK_LIB(resolv,res_search)
if test -d ${gssapi}; then
|