configure.in: Remove standardized set of autoconf macros, which are

	now handled by CONFIG_RULES.

dumpv4.c: Change name of controlling #ifdef to be KRB5_KRB4_COMPAT
	instead of KRB4.

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

diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog
index 56c796faf383950d52b297ae04b84d7ccbbb59dd..9e82a37b8de84be3b08dbf089db04c5cbe655fa7 100644 (file)
--- a/src/admin/edit/ChangeLog
+++ b/src/admin/edit/ChangeLog
@@ -1,3 +1,11 @@
+Fri Jun  9 18:14:43 1995    <tytso@rsx-11.mit.edu>
+
+       * configure.in: Remove standardized set of autoconf macros, which
+               are now handled by CONFIG_RULES.
+
+       * dumpv4.c: Change name of controlling #ifdef to be
+               KRB5_KRB4_COMPAT instead of KRB4.
+
 Sun May 21 14:20:32 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * dumpv4.c: Include k5-int.h before krb.h so that PROTOTYPE is not

diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in
index cfd5695be1dcafcdcfd08257b95a37bad73d3096..e2f9bb075783c22d1645781f7ff33db489d72afe 100644 (file)
--- a/src/admin/edit/configure.in
+++ b/src/admin/edit/configure.in
@@ -1,19 +1,13 @@
 AC_INIT(kdb5_edit.c)
-WITH_CCOPTS
 CONFIG_RULES
-AC_SET_BUILDTOP
 AC_PROG_INSTALL
 AC_PROG_YACC
 AC_HAVE_HEADERS(unistd.h sys/timeb.h alloca.h)
 AC_HAVE_FUNCS(ftime timezone)
 AC_CONST
 AC_HEADER_STDC
-WITH_NETLIB
 AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
 AC_HAVE_FUNCS(getcwd)
 SS_RULES
-KRB_INCLUDE
-WITH_KRB4
-WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/admin/edit/dumpv4.c b/src/admin/edit/dumpv4.c
index 18ec283465888aa206ba680aa9181c8f9f5fa138..6a8d12f274cc93c2953b98fcaf5bc84ee8a372fd 100644 (file)
--- a/src/admin/edit/dumpv4.c
+++ b/src/admin/edit/dumpv4.c
@@ -24,7 +24,7 @@
  * Dump a KDC database into a V4 slave dump.
  */
 
-#ifdef KRB4
+#ifdef KRB5_KRB4_COMPAT
 
 #include "k5-int.h"
 #include "com_err.h"
@@ -362,11 +362,11 @@ handle_one_key(arg, v5master, v5key, v4key)
     return 0;
 }
 
-#else /* KRB4 */
+#else /* KRB5_KRB4_COMPAT */
 void dump_v4db(argc, argv)
        int     argc;
        char    **argv;
 {
        printf("This version of krb5_edit does not support the V4 dump command.\n");
 }
-#endif /* KRB4 */
+#endif /* KRB5_KRB4_COMPAT */