Add ability to switch between Berkeley and DBM for KDC database

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

6 files changed, 57 insertions, 0 deletions

diff --git a/src/kadmin.old/client/ChangeLog b/src/kadmin.old/client/ChangeLog
index 2fdca5600..2f49bc28b 100644
--- a/src/kadmin.old/client/ChangeLog
+++ b/src/kadmin.old/client/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jun 30 14:36:35 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in - Add --with-dbm to select between Berkeley and DBM
+		KDC database format.
+
 Wed Jun 21 10:49:32 1995    <tytso@rsx-11.mit.edu>
 
 	* kadmin.c: Change PROTOTYPE -> KRB5_PROTOTYPE
diff --git a/src/kadmin.old/client/configure.in b/src/kadmin.old/client/configure.in
index b66b8d184..0c6c8f215 100644
--- a/src/kadmin.old/client/configure.in
+++ b/src/kadmin.old/client/configure.in
@@ -3,5 +3,19 @@ CONFIG_RULES
 AC_CHECK_HEADERS(stdlib.h)
 AC_PROG_INSTALL
 ET_RULES
+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)
+	AC_CHECK_LIB(ndbm,main)
+	AC_CHECK_LIB(dbm,main)
+else
+	AC_MSG_RESULT(Using Berkeley db)
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin.old/kpasswd/ChangeLog b/src/kadmin.old/kpasswd/ChangeLog
index 9be1f7c82..b9b20cecd 100644
--- a/src/kadmin.old/kpasswd/ChangeLog
+++ b/src/kadmin.old/kpasswd/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jun 30 14:37:02 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in - Add --with-dbm to select between Berkeley and
+		DBM KDC database format.
+
 Wed Jun 21 10:50:33 1995    <tytso@rsx-11.mit.edu>
 
 	* kpasswd.c: Change PROTOTYPE -> KRB5_PROTOTYPE
diff --git a/src/kadmin.old/kpasswd/configure.in b/src/kadmin.old/kpasswd/configure.in
index 6d6640209..7d4b63cd7 100644
--- a/src/kadmin.old/kpasswd/configure.in
+++ b/src/kadmin.old/kpasswd/configure.in
@@ -5,5 +5,19 @@ AC_HAVE_HEADERS(unistd.h string.h stdlib.h)
 CHECK_UTMP
 AC_FUNC_CHECK(getutent,AC_DEFINE(HAVE_GETUTENT))
 ET_RULES
+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)
+	AC_CHECK_LIB(ndbm,main)
+	AC_CHECK_LIB(dbm,main)
+else
+	AC_MSG_RESULT(Using Berkeley db)
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin.old/server/ChangeLog b/src/kadmin.old/server/ChangeLog
index d31e91109..3b58bc3bc 100644
--- a/src/kadmin.old/server/ChangeLog
+++ b/src/kadmin.old/server/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jun 30 14:37:32 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in - Add --with-dbm to select between Berkeley and DBM
+		KDC database format.
+
+
 Tue Jun 27 16:10:19 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* adm_parse.c - Give compiler something to compile if SANDIA is not
 		defined.  Some compilers choke when nothing to compile.
diff --git a/src/kadmin.old/server/configure.in b/src/kadmin.old/server/configure.in
index 8b56f8cee..282dffb1d 100644
--- a/src/kadmin.old/server/configure.in
+++ b/src/kadmin.old/server/configure.in
@@ -5,5 +5,19 @@ HAS_ANSI_VOLATILE
 AC_TIME_WITH_SYS_TIME
 ET_RULES
 CHECK_SIGPROCMASK
+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)
+	AC_CHECK_LIB(ndbm,main)
+	AC_CHECK_LIB(dbm,main)
+else
+	AC_MSG_RESULT(Using Berkeley db)
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE