summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac9
2 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 70d7591ca..58b7cfba2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,14 @@
ACLOCAL_AMFLAGS = -I m4
+DISTCHECK_CONFIGURE_FLAGS = --with-external-db
+
include $(top_srcdir)/rpm.am
CLEANFILES =
EXTRA_DIST = CHANGES ChangeLog CREDITS GROUPS INSTALL \
autodeps autogen.sh \
- db db3/configure installplatform platform.in
+ db3/configure installplatform platform.in
BUILT_SOURCES =
SUBDIRS = po misc
diff --git a/configure.ac b/configure.ac
index 653d5f939..75e4980bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -451,9 +451,12 @@ yes )
AC_MSG_ERROR([missing required header db.h])
])
;;
-* ) # Fall back to internal db
- # 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])
+* ) # Fall back to internal db if available
+ if [ test -x db/dist/configure ]; then
+ AC_DEFINE(HAVE_DB_H, 1, [Define if you have the <db3/db.h> header file])
+ else
+ AC_MSG_ERROR([internal Berkeley DB directory not present, see INSTALL])
+ fi
;;
esac