From 99deb652aed6395120f957f211dbd604e4aa8774 Mon Sep 17 00:00:00 2001
From: Richard Basch <probe@mit.edu>
Date: Mon, 22 Jan 1996 04:42:57 +0000
Subject: Simplified to simply require the use of WITH_ANAME or
 USE_KDB5_LIBRARY to specify the need for dbm inclusion/testing/compilation
 flags.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7350 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/admin/edit/Makefile.in  |  1 +
 src/admin/edit/configure.in | 32 +-------------------------------
 2 files changed, 2 insertions(+), 31 deletions(-)

(limited to 'src/admin/edit')

diff --git a/src/admin/edit/Makefile.in b/src/admin/edit/Makefile.in
index 3d6c6546e..54ead39ca 100644
--- a/src/admin/edit/Makefile.in
+++ b/src/admin/edit/Makefile.in
@@ -1,3 +1,4 @@
+DEFS = @DEFS@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
 all::
diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in
index 9fa1d87b3..ecf5dae89 100644
--- a/src/admin/edit/configure.in
+++ b/src/admin/edit/configure.in
@@ -6,39 +6,9 @@ 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.],
-,
-withval=no)dnl
-if test "$withval" = yes; then
-	AC_MSG_RESULT(Using Kerberos version 4 database library)
-	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
+WITH_KDB4(USE_KDB4_LIBRARY,AC_DEFINE(KDB4_DISABLE))
 USE_KRB4_LIBRARY
 USE_SS_LIBRARY
 KRB5_LIBRARIES
-- 
cgit