From 52908dd0b6d92e1b565e06d99d617a98a7108f45 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Thu, 24 Apr 2003 02:33:04 +0000 Subject: [PATCH] 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 --- src/ChangeLog | 5 +++++ src/aclocal.m4 | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0512f15e2..c389fcf2d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2003-04-23 Ken Raeburn + + * aclocal.m4: Require autoconf 2.53. + (CONFIG_RULES): Always set AUTOCONFINCFLAGS to --include. + 2003-04-10 Tom Yu * aclocal.m4: Revert requrement of autoconf-2.53, since MacOS X diff --git a/src/aclocal.m4 b/src/aclocal.m4 index e36a3fd85..68a0461f9 100644 --- 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) -- 2.26.2