use "original db-1.85" if available (Raw Hide glibc 2.1).

CVS patchset: 2640
CVS date: 1998/12/31 22:09:43

CHANGES

@@ -1,4 +1,4 @@
-2.5.6 -> 2.90
+2.5.x -> 2.90
 	- file lookup finally sane wrt symbolic links :-)
 	- fileindex format changed -- rebuilddb is necessary for rpm 2.90!!
 	- --rebuilddb doesn't open old index files
@@ -36,6 +36,9 @@
 	- add {init,add,expand}Macro args everywhere (new macro.c compatibility)
 	- add new fully recursive macro.c
 	- there must be a { between two % in a query format (unless %% is used)
+
+2.5.6 -> 2.5.7:
+	- use "original db-1.85" if available (Raw Hide glibc 2.1).
 	- make sure files to sign exist before asking for the pass phrase
 
 2.5.5 -> 2.5.6:

configure.in

@@ -294,8 +294,9 @@ AC_CHECK_FUNC(socket, [], [
 ])
 
 AC_CHECK_FUNC(dbopen, [],
-  AC_CHECK_LIB(db, dbopen, [], AC_MSG_WARN([sorry this package needs libdb.a 
-(from the db package)]))
+  AC_CHECK_LIB(db1, dbopen, [],
+    AC_CHECK_LIB(db, dbopen, [],
+       AC_MSG_WARN([sorry this package needs libdb.a (from the db package)])))
            )
 
 AC_CHECK_FUNC(fork, [], [echo "using vfork() instead of fork()";
@@ -344,7 +345,8 @@ AC_HEADER_MAJOR
 AC_HEADER_DIRENT
 AC_HEADER_TIME
 
-AC_CHECK_HEADERS(db_185.h fcntl.h getopt.h grp.h memory.h netdb.h pwd.h utime.h)
+AC_CHECK_HEADERS(db_185.h db1/db.h)
+AC_CHECK_HEADERS(fcntl.h getopt.h grp.h memory.h netdb.h pwd.h utime.h)
 
 AC_CHECK_HEADERS(sys/socket.h sys/select.h)
 AC_CHECK_HEADERS(sys/types.h sys/stdtypes.h)

lib/dbindex.h

@@ -1,11 +1,15 @@
 #ifndef H_DBINDEX
 #define H_DBINDEX
 
+#ifdef HAVE_DB1_DB_H
+#include <db1/db.h>
+#else
 #ifdef HAVE_DB_185_H
 #include <db_185.h>
 #else
 #include <db.h>
 #endif
+#endif
 
 /* this will break if sizeof(int) != 4 */