summaryrefslogtreecommitdiffstats
path: root/src/config
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/config
parentc30d0bb95cd7cfbc3ebb895d329e9fbfc7b634a5 (diff)
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/config')
-rw-r--r--src/config/ChangeLog5
-rw-r--r--src/config/post.in3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 21bc14adc..28192ddc3 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-24 Ken Raeburn <raeburn@mit.edu>
+
+ * post.in (configure): Try running autoconf with --include, and if
+ that doesn't work, try --localdir. Don't use AUTOCONFINCFLAGS.
+
2003-04-01 Tom Yu <tlyu@mit.edu>
* pre.in (KDB5_DEPLIBS): Don't depend on $(DB_DEPLIB) anymore.
diff --git a/src/config/post.in b/src/config/post.in
index 2c49dd304..0a14ce852 100644
--- a/src/config/post.in
+++ b/src/config/post.in
@@ -149,7 +149,8 @@ $(srcdir)/$(thisconfigdir)/configure: $(srcdir)/$(thisconfigdir)/configure.in \
$(SRCTOP)/aclocal.m4
-$(RM) -r $(srcdir)/$(thisconfigdir)/autom4te.cache
cd $(srcdir)/$(thisconfigdir) && \
- $(AUTOCONF) ${AUTOCONFINCFLAGS}=$(CONFIG_RELTOPDIR) $(AUTOCONFFLAGS)
+ ($(AUTOCONF) --include=$(CONFIG_RELTOPDIR) $(AUTOCONFFLAGS) || \
+ $(AUTOCONF) --localdir=$(CONFIG_RELTOPDIR) $(AUTOCONFFLAGS))
-$(RM) -r $(srcdir)/$(thisconfigdir)/autom4te.cache
RECURSE_TARGETS=all-recurse clean-recurse distclean-recurse install-recurse \