24 files changed, 13 insertions, 364 deletions

diff --git a/src/admin/aname/Makefile.in b/src/admin/aname/Makefile.in
index 1de452a..7b6e934 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 397536e..204fca1 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 248acf5..c72ceb4 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 09e9363..ef0252c 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 7c47164..c9fb219 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 3d6c654..54ead39 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 9fa1d87..ecf5dae 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 c37cbcf..93fa3ef 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
diff --git a/src/appl/gssftp/ftpd/configure.in b/src/appl/gssftp/ftpd/configure.in
index 67e001f..b8c99a0 100644
--- a/src/appl/gssftp/ftpd/configure.in
+++ b/src/appl/gssftp/ftpd/configure.in
@@ -28,6 +28,6 @@ AC_SUBST([SETENVSRC])
 AC_SUBST([SETENVOBJ])
 fi
 dnl
-WITH_DBM_LNAME
+USE_ANAME
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin.old/client/configure.in b/src/kadmin.old/client/configure.in
index 33cebc8..dd3f191 100644
--- a/src/kadmin.old/client/configure.in
+++ b/src/kadmin.old/client/configure.in
@@ -3,20 +3,6 @@ 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
 USE_KDB5_LIBRARY
 KRB5_LIBRARIES
 V5_USE_SHARED_LIB
diff --git a/src/kadmin.old/kpasswd/configure.in b/src/kadmin.old/kpasswd/configure.in
index a3d0858..ebbe103 100644
--- a/src/kadmin.old/kpasswd/configure.in
+++ b/src/kadmin.old/kpasswd/configure.in
@@ -5,20 +5,6 @@ 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
 USE_KDB5_LIBRARY
 KRB5_LIBRARIES
 V5_USE_SHARED_LIB
diff --git a/src/kadmin.old/server/configure.in b/src/kadmin.old/server/configure.in
index 70c7585..0ffe6d9 100644
--- a/src/kadmin.old/server/configure.in
+++ b/src/kadmin.old/server/configure.in
@@ -5,20 +5,6 @@ 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
 USE_KADM_LIBRARY
 USE_KDB5_LIBRARY
 KRB5_LIBRARIES
diff --git a/src/kadmin/v5client/configure.in b/src/kadmin/v5client/configure.in
index 0815bbd..85af6e0 100644
--- a/src/kadmin/v5client/configure.in
+++ b/src/kadmin/v5client/configure.in
@@ -6,20 +6,6 @@ AC_HAVE_HEADERS(pwd.h regex.h regexp.h)
 AC_HAVE_FUNCS(strptime re_comp regcomp getcwd)
 AC_CONST
 SS_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
 USE_KADM_LIBRARY
 USE_KDB5_LIBRARY
 USE_KRB4_LIBRARY
diff --git a/src/kadmin/v5server/configure.in b/src/kadmin/v5server/configure.in
index 3817967..35aae99 100644
--- a/src/kadmin/v5server/configure.in
+++ b/src/kadmin/v5server/configure.in
@@ -8,20 +8,6 @@ CHECK_SIGNALS
 CHECK_SETJMP
 CHECK_WAIT_TYPE
 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
 USE_KADM_LIBRARY
 USE_KDB5_LIBRARY
 KRB5_LIBRARIES
diff --git a/src/kdc/configure.in b/src/kdc/configure.in
index 90f90d8..d75f15d 100644
--- a/src/kdc/configure.in
+++ b/src/kdc/configure.in
@@ -23,7 +23,7 @@ dnl information and failure information.
 dnl
 AC_ARG_WITH([kdc-kdb-update],
 [  --with-kdc-kdb-update	Update the database
-  --without-kdc-kdb-update1	Do not update the database (default)],
+  --without-kdc-kdb-update	Do not update the database (default)],
 ,
 withval=no)dnl
 if test "$withval" = yes; then
@@ -31,22 +31,6 @@ if test "$withval" = yes; then
 	AC_DEFINE(KRBCONF_KDC_MODIFIES_KDB)
 fi
 dnl
-dnl --with-dbm uses native DBM for the KDC database.
-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)
-	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
 USE_KRB4_LIBRARY
diff --git a/src/krb524/configure.in b/src/krb524/configure.in
index 95b73ed..1578002 100644
--- a/src/krb524/configure.in
+++ b/src/krb524/configure.in
@@ -6,20 +6,6 @@ AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_TYPE_SIGNAL
 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
 USE_KDB5_LIBRARY
 USE_KRB4_LIBRARY
 KRB5_LIBRARIES
diff --git a/src/lib/configure.in b/src/lib/configure.in
index 0a1bae6..3a5bfd1 100644
--- a/src/lib/configure.in
+++ b/src/lib/configure.in
@@ -2,16 +2,7 @@ AC_INIT(configure.in)
 CONFIG_RULES
 if test $krb5_cv_build_krb4_libs = yes ; then
 	AC_MSG_RESULT(building Kerberos 4 libraries)
-	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" = no; then
-		kdb4=
-	else
-		kdb4=kdb4
-	fi
+	WITH_KDB4(kdb4=kdb4,kdb4=)
 	krb4=krb4
 else
 	AC_MSG_RESULT(skipping Kerberos 4 libraries)
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index e450ad6..3e96d8a 100644
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -1,5 +1,4 @@
-DBFLAGS=@DBFLAGS@
-CFLAGS = $(CCOPTS) $(DEFS) $(DBFLAGS)
+CFLAGS = $(CCOPTS) $(DEFS)
 
 all:: $(OBJS)
 
diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in
index 4b45a6a..504755a 100644
--- a/src/lib/kdb/configure.in
+++ b/src/lib/kdb/configure.in
@@ -5,54 +5,7 @@ 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
-AC_CHECK_LIB(ndbm,main)
-AC_CHECK_LIB(dbm,main)
-AC_MSG_CHECKING([for missing dbm_error prototype])
-if test "$ac_cv_func_dbm_open" = yes; then
-	AC_EGREP_HEADER([dbm_error], [ndbm.h],
-	AC_MSG_RESULT(no), AC_TRY_LINK(
-[#include <ndbm.h>
-int dbm_error();],
-[dbm_error();], AC_DEFINE([MISSING_ERROR_PROTO])
-AC_MSG_RESULT(yes), AC_MSG_RESULT(no)))
-else
-	AC_EGREP_HEADER([dbm_error], [ndbm.h],
-	AC_MSG_RESULT(no), AC_TRY_LINK(
-[#include <dbm.h>
-int dbm_error();],
-[dbm_error();], AC_DEFINE([MISSING_ERROR_PROTO])
-AC_MSG_RESULT(yes), AC_MSG_RESULT(no)))
-fi
-AC_MSG_CHECKING([for missing dbm_clearerr prototype])
-if test "$ac_cv_func_dbm_open" = yes; then
-	AC_EGREP_HEADER([dbm_error], [ndbm.h],
-	AC_MSG_RESULT(no), AC_TRY_LINK(
-[#include <ndbm.h>
-int dbm_clearerr();],
-[dbm_clearerr();], AC_DEFINE([MISSING_CLEARERR_PROTO])
-AC_MSG_RESULT(yes), AC_MSG_RESULT(no)))
-else
-	AC_EGREP_HEADER([dbm_error], [ndbm.h],
-	AC_MSG_RESULT(no), AC_TRY_LINK(
-[#include <dbm.h>
-int dbm_clearerr();],
-[dbm_clearerr();], AC_DEFINE([MISSING_CLEARERR_PROTO])
-AC_MSG_RESULT(yes), AC_MSG_RESULT(no)))
-fi
-dnl
+WITH_DB
 V5_USE_SHARED_LIB
 AC_CHECK_FUNCS(srand48 srand srandom umask)
 LinkFileDir(../libkdb5.a, libkdb5.a, ./kdb)
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index 9fd7e7d..225c18c 100644
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -1,5 +1,4 @@
-DBFLAGS=@DBFLAGS@
-CFLAGS = $(CCOPTS) $(DEFS) $(DBFLAGS) -DAN_TO_LN_RULES
+CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..
 ##DOSLIBNAME=..\krb5.lib
diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in
index c356bfc..a41dd61 100644
--- a/src/lib/krb5/os/configure.in
+++ b/src/lib/krb5/os/configure.in
@@ -7,20 +7,8 @@ AC_HAVE_HEADERS(unistd.h sys/time.h regex.h regexp.h)
 AC_HAVE_FUNCS(re_comp regcomp)
 AC_HEADER_EGREP(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES))
 HAS_ANSI_VOLATILE
-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
-if test "$withval" = yes; then
-	AC_MSG_RESULT(Using native dbm for aname_to_lname database)
-	DBFLAGS=
-else
-	AC_MSG_RESULT(Using Berkeley db for aname_to_lname database)
-	DBFLAGS=-DBERK_DB_DBM
-fi
-AC_SUBST(DBFLAGS)dnl
-dnl
+USE_ANAME
+AC_DEFINE(AN_TO_LN_RULES)
 V5_SHARED_LIB_OBJS
 SubdirLibraryRule([${OBJS}])
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/slave/configure.in b/src/slave/configure.in
index 8c6982b..4f94ea5 100644
--- a/src/slave/configure.in
+++ b/src/slave/configure.in
@@ -3,20 +3,6 @@ CONFIG_RULES
 AC_PROG_INSTALL
 AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS)))
 AC_CHECK_LIB(util,main)
-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/tests/create/configure.in b/src/tests/create/configure.in
index 3cc77e6..d289622 100644
--- a/src/tests/create/configure.in
+++ b/src/tests/create/configure.in
@@ -3,19 +3,4 @@ CONFIG_RULES
 AC_PROG_INSTALL
 USE_KDB5_LIBRARY
 KRB5_LIBRARIES
-dnl
-dnl --with-dbm uses native DBM for the KDC database.
-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)
-	AC_CHECK_LIB(ndbm,main)
-	AC_CHECK_LIB(dbm,main)
-else
-	AC_MSG_RESULT(Using Berkeley db)
-fi
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/verify/configure.in b/src/tests/verify/configure.in
index c5a25bc..a9dd5df 100644
--- a/src/tests/verify/configure.in
+++ b/src/tests/verify/configure.in
@@ -3,19 +3,4 @@ CONFIG_RULES
 AC_PROG_INSTALL
 USE_KDB5_LIBRARY
 KRB5_LIBRARIES
-dnl
-dnl --with-dbm uses native DBM for the KDC database.
-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)
-	AC_CHECK_LIB(ndbm,main)
-	AC_CHECK_LIB(dbm,main)
-else
-	AC_MSG_RESULT(Using Berkeley db)
-fi
 V5_AC_OUTPUT_MAKEFILE