* configure.in: correct use of --with-krb4 to match top level

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

diff --git a/src/admin/ChangeLog b/src/admin/ChangeLog
index 92e24d2b5f445a40ca54f69d5823b055bbe7d407..065499a833e2ff23f4c94abbe8e0b155c66e7976 100644 (file)
--- a/src/admin/ChangeLog
+++ b/src/admin/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 28 11:15:56 1995  Mark Eichin  <eichin@cygnus.com>
+
+       * configure.in: correct use of --with-krb4 to match top level.
+
 Sat Jul 16 09:18:49 1994  Tom Yu  (tlyu at dragons-lair)
 
        * configure.in (in all relevant subdirs): another try at making

diff --git a/src/admin/configure.in b/src/admin/configure.in
index 28f5995c7a0f26f7bbec4f9e83cefa193acda9a8..30e7910969ab283002fffeea665874165c6e1ae2 100644 (file)
--- a/src/admin/configure.in
+++ b/src/admin/configure.in
@@ -1,7 +1,14 @@
 AC_INIT(configure.in)
 WITH_CCOPTS
 AC_SET_BUILDTOP
-AC_ARG_WITH([krb4],[include Kerberos V4 support],convert=convert,convert=)
+AC_ARG_WITH([krb4],[include Kerberos V4 support],,withval=yes)dnl
+if test $withval = no; then
+       AC_MSG_RESULT(disabling kdb5_convert)
+       convert=
+else
+       AC_MSG_RESULT(kdb5_convert included)
+       convert=convert
+fi
 CONFIG_DIRS(create destroy edit stash aname $convert)
 MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 1905f2afc56bfb222dd80d0deebc57ef1b517289..1536fa32f6a5ada740781d172c2f8e36ff8d5167 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 28 11:11:54 1995  Mark Eichin  <eichin@cygnus.com>
+
+       * configure.in: correct use of --with-krb4 to match top level.
+
 Thu Apr 27 17:39:04 1995 Keith Vetter (keithv@fusion.com)
 
        * k5-config.h: Added MAXPATHLEN constant.

diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in
index 1152628b0783a634cc45a1414dc62edb00a533a2..6276d1ba359013ae8c78d62f0012ba8f70b9586f 100644 (file)
--- a/src/include/krb5/configure.in
+++ b/src/include/krb5/configure.in
@@ -133,8 +133,13 @@ AC_ARG_ENABLE([athena],
 [  --enable-athena         build with MIT Project Athena configuration],
 AC_DEFINE(KRB5_ATHENA_COMPAT),)
 
-AC_ARG_WITH([krb4],
-[  --with-krb4=KRB4DIR     build with Kerberos V4 backwards compatibility],
-AC_DEFINE(KRB5_KRB4_COMPAT),,)
-
+AC_ARG_WITH([krb4],,
+dnl leave out help string, see top level for that
+,withval=yes)dnl
+if test $withval = no; then
+       AC_MSG_RESULT(No Kerberos 4 compatibility)
+else
+       AC_MSG_RESULT(Kerberos 4 compatibility enabled)
+       AC_DEFINE(KRB5_KRB4_COMPAT)
+fi
 V5_AC_OUTPUT_MAKEFILE