Simplify autoconf compatibility by requiring that we always have a version that

supports --include, instead of assuming that whether the autoconf to be run
supports it is the same as whether the autoconf used to generate the current
configure scripts supported it.

* aclocal.m4: Require autoconf 2.53.
(CONFIG_RULES): Always set AUTOCONFINCFLAGS to --include.

ticket: 1242
status: open

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 0512f15e2f0d68b6e0f1bd31e7320f288c308f7a..c389fcf2d30c24cb21b2cb0751953403c0b31391 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-23  Ken Raeburn  <raeburn@mit.edu>
+
+       * aclocal.m4: Require autoconf 2.53.
+       (CONFIG_RULES): Always set AUTOCONFINCFLAGS to --include.
+
 2003-04-10  Tom Yu  <tlyu@mit.edu>
 
        * aclocal.m4: Revert requrement of autoconf-2.53, since MacOS X

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index e36a3fd85f84e239e1b407277f89bb57f193b26d..68a0461f995505292dfbe6520284df3c4634e9cf 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1,4 +1,5 @@
-AC_PREREQ(2.52)
+AC_PREREQ(2.53)
+dnl 2.53 needed so we don't have to worry about using --localdir
 AC_COPYRIGHT([Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 Massachusetts Institute of Technology.
 ])
@@ -79,9 +80,7 @@ dnl else
        AUTOCONFFLAGS=
        AUTOHEADER=autoheader
        AUTOHEADERFLAGS=
-dnl Autoconf 2.54+ use --include, --localdir is obsolete and removed
-ifdef([AC_MSG_FAILURE],        AUTOCONFINCFLAGS="--include", dnl
-       AUTOCONFINCFLAGS="--localdir")
+       AUTOCONFINCFLAGS="--include"
 dnl fi
 AC_SUBST(AUTOCONF)
 AC_SUBST(AUTOCONFFLAGS)