Use HAVE_DB_H for both internal and external BDB

- rpmdb only cares whether we have BDB or no, internal vs external
  doesn't matter
- makes external BDB actually work

diff --git a/configure.ac b/configure.ac
index 9003e9b..098b69d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -462,7 +462,7 @@ esac],
 
 case "$with_external_db" in
 yes )
-  AC_CHECK_HEADER([db.h],[
+  AC_CHECK_HEADERS([db.h],[
     AC_CHECK_TYPE([db_threadid_t],[],
       [AC_MSG_WARN([missing type db_threadid_t])],
       [#include <db.h>])
@@ -486,7 +486,8 @@ yes )
   ])
   ;;
 * ) # Fall back to internal db
-  AC_DEFINE(HAVE_DB3_DB_H, 1, [Define if you have the <db3/db.h> header file])
+  # XXX for now we always have in-tree BDB available...
+  AC_DEFINE(HAVE_DB_H, 1, [Define if you have the <db3/db.h> header file])
   ;;
 esac
 

diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index ad79a2e..4534489 100644 (file)
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -188,7 +188,7 @@ static void dbiTagsInit(void)
 #define        DB1vec          NULL
 #define        DB2vec          NULL
 
-#ifdef HAVE_DB3_DB_H
+#ifdef HAVE_DB_H
 extern struct _dbiVec db3vec;
 #define        DB3vec          &db3vec
 #else
@@ -310,7 +310,7 @@ exit:
            db->db_bits = PBM_ALLOC(db->db_nbits);
        }
     }
-#ifdef HAVE_DB3_DB_H
+#ifdef HAVE_DB_H
       else
        dbi = db3Free(dbi);
 #endif