]>
Commit | Line | Data |
---|---|---|
1c5c5dba AF |
1 | --- rpm-4.0.4/rpmdb/dbconfig.c.wiget Sun Jan 20 17:48:23 2002 |
2 | +++ rpm-4.0.4/rpmdb/dbconfig.c Wed Feb 13 22:45:40 2002 | |
3 | @@ -15,7 +15,7 @@ | |
4 | /*@=redef@*/ | |
5 | #endif | |
6 | ||
7 | -#include <db3/db.h> | |
8 | +#include DB_H | |
9 | ||
10 | #include <rpmlib.h> | |
11 | #include <rpmmacro.h> | |
12 | --- rpm-4.0.4/rpmdb/db3.c.wiget Sun Jan 20 18:09:56 2002 | |
13 | +++ rpm-4.0.4/rpmdb/db3.c Wed Feb 13 22:45:57 2002 | |
14 | @@ -23,7 +23,7 @@ | |
15 | /*@=redef@*/ | |
16 | #endif | |
17 | ||
18 | -#include <db3/db.h> | |
19 | +#include DB_H | |
20 | ||
21 | #include <rpmlib.h> | |
22 | #include <rpmmacro.h> | |
23 | --- rpm-4.0.4/system.h.wiget Wed Feb 13 22:46:12 2002 | |
24 | +++ rpm-4.0.4/system.h Wed Feb 13 22:48:21 2002 | |
25 | @@ -581,4 +581,13 @@ | |
26 | #ifndef MOUNTED | |
27 | #define MOUNTED "/etc/mnttab" | |
28 | #endif | |
29 | + | |
30 | +#ifdef HAVE_DB4_DB_H | |
31 | +#define DB_H <db4/db.h> | |
32 | +#elif defined(HAVE_DB3_DB_H) | |
33 | +#define DB_H <db3/db.h> | |
34 | +#else | |
35 | +#define DB_H <db.h> | |
36 | +#endif | |
37 | + | |
38 | #endif /* H_SYSTEM */ | |
39 | --- rpm-4.0.4/configure.in.wiget Wed Feb 13 22:48:32 2002 | |
40 | +++ rpm-4.0.4/configure.in Wed Feb 13 22:53:31 2002 | |
41 | @@ -393,14 +393,16 @@ | |
42 | if test $withval = no ; then | |
43 | dnl ------------------ without internal db | |
44 | ||
45 | -AC_CHECK_HEADERS(db3/db.h) | |
46 | +AC_CHECK_HEADERS(db4/db.h db3/db.h) | |
47 | ||
48 | dnl Check for Berkeley db3 API. | |
49 | AC_CHECK_FUNC(db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"], | |
50 | - AC_CHECK_LIB(db-3.2, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.2"], | |
51 | - AC_CHECK_LIB(db-3.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.1"], | |
52 | - AC_CHECK_LIB(db-3.0, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.0"], | |
53 | - AC_CHECK_LIB(db, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb"], | |
54 | + AC_CHECK_LIB(db-4.0, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-4.0"], | |
55 | + AC_CHECK_LIB(db-3.2, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.2"], | |
56 | + AC_CHECK_LIB(db-3.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.1"], | |
57 | + AC_CHECK_LIB(db-3.0, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.0"], | |
58 | + AC_CHECK_LIB(db, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb"], | |
59 | + ,$libthread) | |
60 | ,$libthread) | |
61 | ,$libthread) | |
62 | ,$libthread) |