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
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
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
27 #define MOUNTED "/etc/mnttab"
31 +#define DB_H <db4/db.h>
32 +#elif defined(HAVE_DB3_DB_H)
33 +#define DB_H <db3/db.h>
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
42 if test $withval = no ; then
43 dnl ------------------ without internal db
45 -AC_CHECK_HEADERS(db3/db.h)
46 +AC_CHECK_HEADERS(db4/db.h db3/db.h)
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"],