* aclocal.m4 (WITH_DBM_LNAME): add --with-dbm-lname for callers of

	an_to_ln routines that have USE_DBM_LNAME set.
	* aclocal.m4 (WITH_DBM_KDB): avoid duplicating --with-dbm code all
	over the place.

(from CNS. Eventually they need to be referenced a bunch of places, but
 for now gssftp uses the former so I have an excuse to drop them in...)

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

diff --git a/src/ChangeLog b/src/ChangeLog
index fb1dc73b1caa2085ed226bbeb7d4777f7379561e..bf1ed2174177fe2bd2245d8257ae2f622388c626 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan 15 02:35:02 1996  Mark Eichin  <eichin@cygnus.com>
+
+       * aclocal.m4 (WITH_DBM_LNAME): add --with-dbm-lname for callers of
+       an_to_ln routines that have USE_DBM_LNAME set.
+       * aclocal.m4 (WITH_DBM_KDB): avoid duplicating --with-dbm code all
+       over the place.
+
 Sun Dec 17 19:53:54 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * acconfig.h: Add blank line to work around a misfeature of

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index c52a02afcd6dc5f5879b0b81af661d0f18ce1df8..0cdb257e141fd8b47e2ddc697a06df36af12338e 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -959,6 +959,41 @@ else
 fi
 AC_SUBST(LDARGS)
 ])dnl
+dnl
+dnl --with-dbm uses native DBM for the KDC database.
+dnl
+define(WITH_DBM_KDB,[
+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
+])dnl
+dnl
+dnl --with-dbm-lname uses native DBM for the aname to lname conversion
+dnl
+define(WITH_DBM_LNAME,[
+AC_ARG_WITH([dbm-lname],
+[  --with-dbm-lname              use native dbm for aname to lname conversion
+  --without-dbm-lname           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
+])dnl
+dnl