From: Paul Park <pjpark@mit.edu>
Date: Thu, 27 Jul 1995 19:35:53 +0000 (+0000)
Subject: Add --with-dbm check
X-Git-Tag: krb5-1.0-beta6~1489
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8c85a81fa112ad4a22b1254125e0906208c24572;p=krb5.git

Add --with-dbm check

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

diff --git a/src/admin/convert/ChangeLog b/src/admin/convert/ChangeLog
index 02b81707f..29319bbe7 100644
--- a/src/admin/convert/ChangeLog
+++ b/src/admin/convert/ChangeLog
@@ -1,4 +1,8 @@
 
+Thu Jul 27 14:59:53 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in - Add --with-dbm and check for already checking for dbm.
+
+
 Mon Jul 17 14:55:58 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* configure.in - Add KADM library.
 	* kdb5_convert.c - Change calling sequence to krb5_db_fetch_mkey(),
diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in
index 444d81d74..248acf5b0 100644
--- a/src/admin/convert/configure.in
+++ b/src/admin/convert/configure.in
@@ -1,6 +1,7 @@
 AC_INIT(kdb5_convert.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+did_dbm_lib=no
 AC_ARG_WITH([kdb4],
 [  --with-kdb4		use Kerberos version 4 database library.
   --without-kdb4	Avoid using Kerberos version 4 database library.],
@@ -11,9 +12,26 @@ if test "$withval" = yes; then
 	USE_KDB4_LIBRARY
 	AC_CHECK_LIB(ndbm,main)
 	AC_CHECK_LIB(dbm,main)
+	did_dbm_lib=yes
 else
 	AC_DEFINE(KDB4_DISABLE)
 fi
+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)
+	if test "$did_dbm_lib" = no; then
+		AC_CHECK_LIB(ndbm,main)
+		AC_CHECK_LIB(dbm,main)
+	fi
+else
+	AC_MSG_RESULT(Using Berkeley db)
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 USE_KADM_LIBRARY
 USE_KDB5_LIBRARY
 USE_KRB4_LIBRARY
diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog
index ead9c84c0..86826abfc 100644
--- a/src/admin/edit/ChangeLog
+++ b/src/admin/edit/ChangeLog
@@ -1,4 +1,8 @@
 
+Thu Jul 27 15:01:01 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in - Add --with-dbm and check for already checking for dbm.
+
+
 Thu Jul 27 02:59:05 1995   Chris Provenzano (proven@mit.edu)
 
         * dump.c kdb5_edit.c kdb5_edit.h util.c : Use new kdb format.
diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in
index 208b6fba8..89ef9e1e8 100644
--- a/src/admin/edit/configure.in
+++ b/src/admin/edit/configure.in
@@ -8,6 +8,7 @@ AC_CONST
 AC_HEADER_STDC
 AC_HAVE_FUNCS(getcwd)
 SS_RULES
+edit_dbm_done=no
 AC_ARG_WITH([kdb4],
 [  --with-kdb4		use Kerberos version 4 database library.
   --without-kdb4	Avoid using Kerberos version 4 database library.],
@@ -18,9 +19,26 @@ if test "$withval" = yes; then
 	USE_KDB4_LIBRARY
 	AC_CHECK_LIB(ndbm,main)
 	AC_CHECK_LIB(dbm,main)
+	edit_dbm_done=yes
 else
 	AC_DEFINE(KDB4_DISABLE)
 fi
+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)
+	if test "$edit_dbm_done" = no; then
+		AC_CHECK_LIB(ndbm,main)
+		AC_CHECK_LIB(dbm,main)
+	fi
+else
+	AC_MSG_RESULT(Using Berkeley db)
+fi
+AC_SUBST(DBFLAGS)dnl
+dnl
 USE_KADM_LIBRARY
 USE_KDB5_LIBRARY
 USE_KRB4_LIBRARY