diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | CREDITS | 1 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | lib/dbindex.c | 4 | ||||
| -rw-r--r-- | lib/dbindex.h | 4 | ||||
| -rw-r--r-- | lib/rpmlib.h | 4 |
6 files changed, 16 insertions, 0 deletions
@@ -6,6 +6,8 @@ - unlink before writing .rpms - librpm.c: added headerGzRead()/headerGzWrite() - set bzip2path via lib-rpmrc/configure (Toshio Kuratomi) + - added finish translation (Raimo Koski) + - prefer db_185.h to db.h (Christopher Seawood) 2.4.109 -> 2.5: - fixed return code bug in build code @@ -31,6 +31,7 @@ Significant code, ideas, or porting help have been contributed by: Michael Nyquisk Steve Sanbeg Tyson Sawyer + Christopher Seawood Johnie Stafford Gary Thomas Bob Tanner diff --git a/configure.in b/configure.in index 105533720..61be55bbf 100644 --- a/configure.in +++ b/configure.in @@ -356,6 +356,7 @@ AC_CHECK_HEADERS(mntent.h sys/mnttab.h sys/systemcfg.h) AC_CHECK_HEADERS(sys/mount.h sys/mntctl.h sys/vmount.h) AC_CHECK_HEADERS(glob.h,,MISCOBJS="$MISCOBJS glob.o") AC_CHECK_HEADERS(fnmatch.h,,MISCOBJS="$MISCOBJS fnmatch.o") +AC_CHECK_HEADERS(db_185.h) if test "$PO" = po; then AC_CHECK_HEADERS(libintl.h) diff --git a/lib/dbindex.c b/lib/dbindex.c index 1be016a41..6a3a4006f 100644 --- a/lib/dbindex.c +++ b/lib/dbindex.c @@ -1,7 +1,11 @@ #include "config.h" #include "miscfn.h" +#ifdef HAVE_DB_185_H +#include <db_185.h> +#else #include <db.h> +#endif #include <errno.h> #include <stdlib.h> #include <string.h> diff --git a/lib/dbindex.h b/lib/dbindex.h index 89822b145..1e9de4aa3 100644 --- a/lib/dbindex.h +++ b/lib/dbindex.h @@ -7,7 +7,11 @@ extern "C" { /* this will break if sizeof(int) != 4 */ +#ifdef HAVE_DB_185_H +#include <db_185.h> +#else #include <db.h> +#endif typedef struct { unsigned int recOffset; diff --git a/lib/rpmlib.h b/lib/rpmlib.h index d8ba4ad6e..a42b1cc4b 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -3,7 +3,11 @@ /* This is the *only* module users of rpmlib should need to include */ +#ifdef HAVE_DB_185_H +#include <db_185.h> +#else #include <db.h> +#endif /* it shouldn't need these :-( */ #include "dbindex.h" |