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

diff --git a/src/ChangeLog b/src/ChangeLog
index c389fcf2d30c24cb21b2cb0751953403c0b31391..c87b8fa9938310dfebed4826faa6f10d844c00db 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-24  Ken Raeburn  <raeburn@mit.edu>
+
+       * aclocal.m4: Require autoconf 2.52 only.
+
 2003-04-23  Ken Raeburn  <raeburn@mit.edu>
 
        * aclocal.m4: Require autoconf 2.53.

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 68a0461f995505292dfbe6520284df3c4634e9cf..1a7c11b3cd7a79e2b138ae963c88d673cfedfde2 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1,5 +1,4 @@
-AC_PREREQ(2.53)
-dnl 2.53 needed so we don't have to worry about using --localdir
+AC_PREREQ(2.52)
 AC_COPYRIGHT([Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 Massachusetts Institute of Technology.
 ])

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 21bc14adc40401dbf6a6bf288b5e52fd09688adb..28192ddc3e1b5c2eb2c907aa84f15ee807930ac7 100644 (file)
--- 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 2c49dd304f3c23ddc45d2231816af5df5e63bc09..0a14ce8529df0aa2994c6199722a501ec3ecdb45 100644 (file)
--- 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 \

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index fea9e3ee1fcdc5830b942e603349919b7ccf4b35..85f8920243e7dd2498a971962fefef8bfe888ecb 100644 (file)
--- 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 df810299f79ba89edf8f7f9390b0ef0fe3af0740..c3f873a050c44777e74fe19cd572641db7e8774c 100644 (file)
--- 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 \