summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2003-02-27 02:02:09 +0000
committerKen Raeburn <raeburn@mit.edu>2003-02-27 02:02:09 +0000
commit1d2dfec3af11d276628d75bbf3e28953249a0517 (patch)
treededb7adf39e09d6b8a83449c9f5264195919752d
parent8264ff772ecb3a31a9ceed367d6459e42bfdaf5f (diff)
downloadkrb5-1d2dfec3af11d276628d75bbf3e28953249a0517.tar.gz
krb5-1d2dfec3af11d276628d75bbf3e28953249a0517.tar.xz
krb5-1d2dfec3af11d276628d75bbf3e28953249a0517.zip
* 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
-rw-r--r--src/include/ChangeLog5
-rw-r--r--src/include/Makefile.in2
-rw-r--r--src/include/configure.in3
3 files changed, 9 insertions, 1 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index d2b5e6538..dffc4cb7a 100644
--- 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 7727eefd1..df810299f 100644
--- 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 2a2178942..7287f153e 100644
--- 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)