Enable building using --with-external-db

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/Makefile.am b/Makefile.am
index d9bfc673c9a0ca96b6a1c249c2cd989e47add891..d2074fae4cae66b47ea69fd10229cefff4acb507 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -175,7 +175,7 @@ dist_bin_SCRIPTS =  scripts/gendiff
 
 bin_PROGRAMS +=                rpmqpack
 rpmqpack_SOURCES =      rpmqpack.c
-rpmqpack_LDADD =        lib/librpm.la
+rpmqpack_LDADD =        lib/librpm.la @WITH_DB_LIB@
 
 rpmconfig_DATA = rpmrc
 rpmrc: $(top_srcdir)/rpmrc.in

diff --git a/configure.ac b/configure.ac
index c5b797e5ad336faf564ce3dd5a7afa33a3074e90..8e902f19130edb4dc2dac163253e742a5773231a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -359,6 +359,7 @@ yes )
   ],[
     AC_MSG_ERROR([missing required header db.h])
   ])
+  AC_DEFINE(WITH_EXTERNAL_DB, 1, [Use external db?])
   ;;
 * ) # Fall back to internal db if available
   if [ test -x db/dist/configure ]; then

diff --git a/lib/backend/dbconfig.c b/lib/backend/dbconfig.c
index fe7c01e81465e33258b54fb6f5f78fecb7c3f832..446be13f92568f8448079f2c99996f8afa061030 100644 (file)
--- a/lib/backend/dbconfig.c
+++ b/lib/backend/dbconfig.c
@@ -71,8 +71,10 @@ static const struct poptOption rdbOptions[] = {
        NULL, NULL },
  { "lockdbfd", 0,POPT_ARG_NONE,        &staticdbi.dbi_lockdbfd, 0,
        NULL, NULL },
+#ifndef WITH_EXTERNAL_DB
  { "nofsync",  0,POPT_BIT_SET,         &staticdbi.dbi_oflags, DB_NOFSYNC,
        NULL, NULL },
+#endif
 
     POPT_TABLEEND
 };