summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2003-04-25 03:09:57 +0000
committerKen Raeburn <raeburn@mit.edu>2003-04-25 03:09:57 +0000
commitde65b5f9343461402846dce7eeeecae80dd0817d (patch)
treed43a9f8ffba0575d178ce491d506e326b6dbae03 /src/include
parentc30d0bb95cd7cfbc3ebb895d329e9fbfc7b634a5 (diff)
downloadkrb5-de65b5f9343461402846dce7eeeecae80dd0817d.tar.gz
krb5-de65b5f9343461402846dce7eeeecae80dd0817d.tar.xz
krb5-de65b5f9343461402846dce7eeeecae80dd0817d.zip
Require only autoconf 2.52. Try --include argument to autoconf and autoheader,
and if the command fails, try it again with --localdir; don't tie it to some previously used version of autoconf. ticket: 1242 status: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15370 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
-rw-r--r--src/include/ChangeLog6
-rw-r--r--src/include/Makefile.in2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index fea9e3ee1f..85f8920243 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-24 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in ($(srcdir)/krb5/autoconf.stmp): Try running
+ autoheader with --include, and if that doesn't work, try
+ --localdir.
+
2003-04-07 Ken Raeburn <raeburn@mit.edu>
* fake-addrinfo.h (getaddrinfo) [NUMERIC_SERVICE_BROKEN]:
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index df810299f7..c3f873a050 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -28,7 +28,7 @@ krb5/autoconf.h: $(srcdir)/krb5/autoconf.h.in
(cd krb5; $(MAKE) autoconf.h)
$(srcdir)/krb5/autoconf.h.in: $(srcdir)/krb5/autoconf.stmp
$(srcdir)/krb5/autoconf.stmp: $(srcdir)/configure.in
- cd $(srcdir) && $(AUTOHEADER) --localdir=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS)
+ cd $(srcdir) && ($(AUTOHEADER) --include=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS) || $(AUTOHEADER) --localdir=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS))
touch $(srcdir)/krb5/autoconf.stmp
krb5.h: krb5/autoconf.h $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h \