Gentoo Archives: gentoo-commits

From: "Torsten Veller (tove)" <tove@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in mail-filter/maildrop/files: maildrop-2.2.0-db4.patch
Date: Mon, 26 Oct 2009 10:34:20
Message-Id: E1N2Mu1-0006rc-PM@stork.gentoo.org
1 tove 09/10/26 10:34:17
2
3 Added: maildrop-2.2.0-db4.patch
4 Log:
5 Add support for db-4.8 too
6 (Portage version: 2.2_rc46/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 mail-filter/maildrop/files/maildrop-2.2.0-db4.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/maildrop/files/maildrop-2.2.0-db4.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/maildrop/files/maildrop-2.2.0-db4.patch?rev=1.1&content-type=text/plain
13
14 Index: maildrop-2.2.0-db4.patch
15 ===================================================================
16 --- maildrop/bdbobj/configure.in
17 +++ maildrop/bdbobj/configure.in
18 @@ -23,15 +23,19 @@
19 dnl Checks for libraries.
20
21 saveLIBS="$LIBS"
22 -AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
23 - AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
24 - AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
25 - ))
26 +for dbname in db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
27 + do
28 + AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
29 + AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
30 + AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
31 + AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
32
33 + done
34 FOUND_DB=0
35 -AC_CHECK_FUNC(dbopen, FOUND_DB=1)
36 -AC_CHECK_FUNC(db_open, FOUND_DB=1)
37 -AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
38 +AC_CHECK_FUNC(db_create, FOUND_DB=1)
39 +AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
40 +AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
41 +AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
42
43 LIBS="$saveLIBS"
44
45 --- maildrop/configure.in
46 +++ maildrop/configure.in
47 @@ -99,21 +99,24 @@
48 USE_GDBM=1
49 ;;
50 db)
51 - AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
52 - AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
53 - AC_CHECK_LIB(db, db_env_create,
54 - [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
55 - ))
56 -
57 - AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
58 - AC_CHECK_FUNC(db_open, HAVE_BDB=1)
59 - AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
60 + for dbname in db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
61 + do
62 + AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
63 + AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
64 + AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
65 + AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
66 + done
67 + AC_CHECK_FUNC(db_create, HAVE_BDB=1)
68 + AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
69 + AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
70 + AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
71 +
72 if test "$HAVE_BDB" != "1"
73 then
74 - AC_MSG_ERROR(GDBM library not found)
75 + AC_MSG_ERROR(DB library not found)
76 fi
77 dblibrary=bdbobj/libbdbobj.la
78 - USE_GDBM=0
79 + USE_DB=1
80 ;;
81 *)
82 ;;