configure.in: Remove top-level calls to WITH_ANAME_DB and WITH_KDB_DB

aclocal.m4 (WITH_ANAME_DB, WITH_KDB_DB): Remove --with-aname-db and
	--with-kdb-db since we're not using any of them.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 180d5335a9428c338c5307123e05781f74cb8469..63738b094797350b3a40cb323cd232e40200d995 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+Thu Aug 15 17:10:58 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * configure.in: Remove top-level calls to WITH_ANAME_DB and
+               WITH_KDB_DB. 
+
+       * aclocal.m4 (WITH_ANAME_DB, WITH_KDB_DB): Remove --with-aname-db
+               and --with-kdb-db since we're not using any of them.
+
 Thu Aug 15 20:00:15 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * acconfig.h: Remove line with ODBM as definition no longer is

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 5c510cf5f1ffe86e01e4d5256a41a74f1c1009da..49a8e3de5b777af05d48236ce93b1b5a30127b66 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -980,96 +980,6 @@ AC_SUBST(LDARGS)
 ])dnl
 dnl
 dnl
-dnl Database determination
-dnl
-dnl
-dnl Check for missing DBM prototypes
-dnl
-AC_DEFUN(AC_CHECK_DBM_PROTO,[
- AC_MSG_CHECKING([for missing $2 prototype])
- AC_CACHE_VAL(krb5_cv_missing_$2_prototype,
-  AC_EGREP_HEADER([$2], [$1.h],
-   eval krb5_cv_missing_$2_prototype=no,
-   AC_TRY_LINK(
-[#include <$1.h>
-int $2();],
-[$2();], 
-    eval krb5_cv_missing_$2_prototype=yes,
-    eval krb5_cv_missing_$2_prototype=no)))
- if eval "test \"`echo '$krb5_cv_missing_'$2_prototype`\" = yes"; then
-  AC_MSG_RESULT(yes)
-  $4
- else
-  AC_MSG_RESULT(no)
-  $3
- fi
-])dnl
-dnl
-dnl
-dnl --with-aname-db=[dbm type]
-dnl --with-aname-dbopts=[compile flags]
-dnl
-dnl --with-kdb-db=[dbm type]
-dnl --with-kdb-dbopts=[compile flags]
-dnl
-dnl
-define(WITH_ANAME_DB,[
-AC_ARG_WITH([aname-db],
-[  --with-aname-db=DBM     name conversion database type],
-dbval="$withval",
-dbval=
-)dnl
-AC_ARG_WITH([aname-dbopts],
-[  --with-aname-dbopts=CCOPTS  compilation flags],
-dbflags="$withval",
-)dnl
-CHECK_DB
-CPPFLAGS="$CPPFLAGS $dbflags"
-AC_MSG_RESULT(Using $dbval for name conversion database.)
-])dnl
-dnl
-dnl
-dnl
-define(WITH_KDB_DB,[
-AC_ARG_WITH([kdb-db],
-[  --with-kdb-db=DBM       kerberos database type],
-dbval="$withval",
-dbval=
-)dnl
-AC_ARG_WITH([kdb-dbopts],
-[  --with-kdb-dbopts=CCOPTS  compilation flags],
-dbflags="$withval",
-)dnl
-CHECK_DB
-CPPFLAGS="$CPPFLAGS $dbflags"
-AC_MSG_RESULT(Using $dbval for kerberos database.)
-])dnl
-dnl
-dnl
-define(CHECK_DB,[
-if test "$dbval" = "" -o "$dbval" = ndbm; then
-       OLIBS="$LIBS"
-       AC_HEADER_CHECK(ndbm.h,[dbval=ndbm
-         AC_CHECK_FUNC(dbm_nextkey,,
-           AC_CHECK_LIB(ndbm,dbm_nextkey,[dblibs=-lndbm],
-             AC_CHECK_LIB(dbm,dbm_nextkey,[dblibs=-ldbm],
-               AC_CHECK_LIB(gdbm,dbm_nextkey,[dblibs=-lgdbm]))))
-         AC_DEFINE(NDBM)
-         LIBS="$LIBS $dblibs"
-         AC_CHECK_DBM_PROTO($dbval,dbm_error,,
-               AC_DEFINE(MISSING_ERROR_PROTO))
-         AC_CHECK_DBM_PROTO($dbval,dbm_clearerr,,
-               AC_DEFINE(MISSING_CLEARERR_PROTO))])
-       LIBS="$OLIBS"
-fi
-if test "$dbval" = "" -o "$dbval" = db; then
-       dbval=db
-       dblibs=-ldb
-       AC_DEFINE(BERK_DB_DBM)
-fi
-])dnl
-dnl
-dnl
 dnl Check for prototype support - used by application not including k5-int.h
 dnl
 define(KRB5_CHECK_PROTOS,[

diff --git a/src/configure.in b/src/configure.in
index 5885d1449f4dd7cfc3cd04becc301845d05bed5d..f20fe7f9ee87e2f8a186ba350d68c8948e0e6b2e 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -251,12 +251,6 @@ kadminv4=kadmin.v4
 krb524=krb524
 fi
 dnl
-dnl These are here so that the top level configure --help gives useful
-dnl    information. 
-dnl
-WITH_ANAME_DB
-WITH_KDB_DB
-dnl
 CONFIG_DIRS(util include lib $krb524 kdc admin kadmin slave clients appl tests config-files)
 dnl $kadminv4 removed from the above
 DO_SUBDIRS