* configure.in: Set and substitute maybe_kerberosIV.

* Makefile.in (MY_SUBDIRS): Use it.

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index d2b5e653891e7fb8f42917b4c8251bb88a3f446e..dffc4cb7a23d2c734aebf4ad2497258d10cd5076 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-26  Ken Raeburn  <raeburn@mit.edu>
+
+       * configure.in: Set and substitute maybe_kerberosIV.
+       * Makefile.in (MY_SUBDIRS): Use it.
+
 2003-02-19  Ken Raeburn  <raeburn@mit.edu>
 
        * krb5.hin (krb5_princ_component): Return NULL if going off the

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 7727eefd194731df5ae5d0b493ac5ad34d3a2dc2..df810299f79ba89edf8f7f9390b0ef0fe3af0740 100644 (file)
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=.
 myfulldir=include
 mydir=.
-MY_SUBDIRS=krb5 kerberosIV
+MY_SUBDIRS=krb5 @maybe_kerberosIV@
 BUILDTOP=$(REL)..
 ##DOSBUILDTOP = ..
 NO_OUTPRE=1

diff --git a/src/include/configure.in b/src/include/configure.in
index 2a2178942cd000f20384d5cbb17a3cb1e4884929..7287f153e8f5486d51017b8b33470c6aeb70adce 100644 (file)
--- a/src/include/configure.in
+++ b/src/include/configure.in
@@ -187,9 +187,12 @@ AC_DEFINE(KRB5_ATHENA_COMPAT,1,[Define if MIT Project Athena default configurati
 
 if test "$KRB4_LIB" = ''; then
        AC_MSG_RESULT(No Kerberos 4 compatibility)
+       maybe_kerberosIV=
 else
        AC_MSG_RESULT(Kerberos 4 compatibility enabled)
+       maybe_kerberosIV=kerberosIV
        AC_DEFINE(KRB5_KRB4_COMPAT,1,[Define if Kerberos V4 backwards compatibility should be supported])
 fi
+AC_SUBST(maybe_kerberosIV)
 dnl
 V5_AC_OUTPUT_MAKEFILE(. krb5 kerberosIV)