* configure.in (--with-dbm): new option, allows easy building of

	normal dbm support for compatibility.
	* Makefile.in (DBFLAGS): variable to hold substitution of flags to
	enable Berkeley db support.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6199 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index e261ef8b9d0bcc8c25d465666e8a780f82c0c911..130685fe2584d81d6b3e019228ccdfa5dc2a973c 100644 (file)
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 29 06:54:00 1995  Mark Eichin  <eichin@cygnus.com>
+
+       * configure.in (--with-dbm): new option, allows easy building of
+       normal dbm support for compatibility.
+       * Makefile.in (DBFLAGS): variable to hold substitution of flags to
+       enable Berkeley db support.
 
 Thu Jun 22 11:59:28 EDT 1995   Paul Park       (pjpark@mit.edu)
        * kdb_dbm.c - Replace static kdb context with context which is attached

diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index 1b89c199ea7740d791bb51ded851a134d5038243..d6e9dc6d9a6c5a3ce00d62fcc1002027eaa89938 100644 (file)
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -1,4 +1,5 @@
-CFLAGS = $(CCOPTS) $(DEFS) -DBERK_DB_DBM
+DBFLAGS=@DBFLAGS@
+CFLAGS = $(CCOPTS) $(DEFS) $(DBFLAGS)
 LDFLAGS = -g
 
 LIB_SUBDIRS= $(BUILDTOP)/util/berk_db/hash

diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in
index 5a27aeee479e4ea08617263d19be58b251a40486..fce913aa1929320f3570cb5b1774cf20fa216448 100644 (file)
--- a/src/lib/kdb/configure.in
+++ b/src/lib/kdb/configure.in
@@ -5,6 +5,20 @@ AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_HAVE_HEADERS(unistd.h)
+AC_ARG_WITH([dbm],
+[  --with-dbm          use native dbm for kdc database
+  --without-dbm                use included version of Berkeley db (default)],
+,
+withval=no)dnl
+if test "$withval" = yes; then
+       AC_MSG_RESULT(Using native dbm)
+       DBFLAGS=
+else
+       AC_MSG_RESULT(Using Berkeley db)
+       DBFLAGS=-DBERK_DB_DBM
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 V5_USE_SHARED_LIB
 AC_CHECK_FUNCS(srand48 srand srandom umask)
 LinkFileDir(../libkdb5.a, libkdb5.a, ./kdb)