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

8 files changed, 5 insertions, 142 deletions

diff --git a/src/admin/aname/Makefile.in b/src/admin/aname/Makefile.in
index 1de452a4b9..7b6e934921 100644
--- a/src/admin/aname/Makefile.in
+++ b/src/admin/aname/Makefile.in
@@ -1,7 +1,4 @@
-DBFLAGS=@DBFLAGS@
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(DBFLAGS)
-
-all::
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
 all:: kdb5_anadd
 
diff --git a/src/admin/aname/configure.in b/src/admin/aname/configure.in
index 397536e557..204fca1c63 100644
--- a/src/admin/aname/configure.in
+++ b/src/admin/aname/configure.in
@@ -1,40 +1,7 @@
 AC_INIT(kdb5_anadd.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-AC_ARG_WITH([aname-dbm],
-[  --with-aname-dbm		use native dbm for aname_to_lname database
-  --without-aname-dbm		use included version of Berkeley db (default)],
-,
-withval=no)dnl
-did_dbm_lib=no
-if test "$withval" = yes; then
-	AC_MSG_RESULT(Using native dbm for aname_to_lname database)
-	DBFLAGS=
-	AC_CHECK_LIB(ndbm,main)
-	AC_CHECK_LIB(dbm,main)
-	did_dbm_lib=yes
-else
-	AC_MSG_RESULT(Using Berkeley db for aname_to_lname database)
-	DBFLAGS=-DBERK_DB_DBM
-fi
-AC_SUBST(DBFLAGS)dnl
-dnl
-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_ANAME
 KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in
index 248acf5b0d..c72ceb4187 100644
--- a/src/admin/convert/configure.in
+++ b/src/admin/convert/configure.in
@@ -1,37 +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.],
-,
-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)
-	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
+WITH_KDB4(USE_KDB4_LIBRARY,AC_DEFINE(KDB4_DISABLE))
 USE_KADM_LIBRARY
 USE_KDB5_LIBRARY
 USE_KRB4_LIBRARY
diff --git a/src/admin/create/configure.in b/src/admin/create/configure.in
index 09e936347a..ef0252cf42 100644
--- a/src/admin/create/configure.in
+++ b/src/admin/create/configure.in
@@ -1,20 +1,6 @@
 AC_INIT(kdb5_create.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-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
 USE_KADM_LIBRARY
 USE_KDB5_LIBRARY
 KRB5_LIBRARIES
diff --git a/src/admin/destroy/configure.in b/src/admin/destroy/configure.in
index 7c47164e60..c9fb219039 100644
--- a/src/admin/destroy/configure.in
+++ b/src/admin/destroy/configure.in
@@ -1,20 +1,6 @@
 AC_INIT(kdb5_destroy.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-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
 USE_KDB5_LIBRARY
 KRB5_LIBRARIES
 V5_USE_SHARED_LIB
diff --git a/src/admin/edit/Makefile.in b/src/admin/edit/Makefile.in
index 3d6c6546ef..54ead39caa 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 9fa1d87b33..ecf5dae89a 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
diff --git a/src/admin/stash/configure.in b/src/admin/stash/configure.in
index c37cbcf82e..93fa3eff55 100644
--- a/src/admin/stash/configure.in
+++ b/src/admin/stash/configure.in
@@ -1,20 +1,6 @@
 AC_INIT(kdb5_stash.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-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
 USE_KADM_LIBRARY
 USE_KDB5_LIBRARY
 KRB5_LIBRARIES