Invoke autoconf/autoreconf with the option --localdir or --include depending

on if pre/post autoconf 2.54. In 2.55 --localdir has been removed and replaced
with --include which was introduced in 2.53.

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

7 files changed, 40 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index bb2bf79..7991061 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-13  Ezra Peisach  <epeisach@bu.edu>
+
+	* aclocal.m4 (CONFIG_RULES): Define AUTOCONFINCFLAGS as --include
+	or --localdir depending on autoconf version. In autoconf 2.55
+	--localdir disappears.
+
 2002-11-12  Tom Yu  <tlyu@mit.edu>
 
 	* aclocal.m4 (tcl_lib): Add RPATH_TAIL to TCL_RPATH to handle AIX
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 8a4099c..9223bfc 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -81,9 +81,13 @@ 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")
 dnl fi
 AC_SUBST(AUTOCONF)
 AC_SUBST(AUTOCONFFLAGS)
+AC_SUBST(AUTOCONFINCFLAGS)
 AC_SUBST(AUTOHEADER)
 AC_SUBST(AUTOHEADERFLAGS)
 dnl
diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index c4c9e62..8293aca 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-13  Ezra Peisach  <epeisach@bu.edu>
+
+	* pre.in (AUTOCONFINCFLAGS): Define by configure.
+
+	* post.in (Makefile): Invoke autoconf with AUTOCONFINCFLAGS
+	instead of hardcoding --localdir.
+
 2002-11-12  Tom Yu  <tlyu@mit.edu>
 
 	* shlib.conf: Fix AIX to explicitly include system libraries in
diff --git a/src/config/post.in b/src/config/post.in
index 5d45bf2..8972c65 100644
--- a/src/config/post.in
+++ b/src/config/post.in
@@ -96,7 +96,7 @@ $(srcdir)/$(thisconfigdir)/configure: $(srcdir)/$(thisconfigdir)/configure.in \
 		$(SRCTOP)/aclocal.m4
 	-$(RM) -r $(srcdir)/$(thisconfigdir)/autom4te.cache
 	cd $(srcdir)/$(thisconfigdir) && \
-		$(AUTOCONF) --localdir=$(CONFIG_RELTOPDIR) $(AUTOCONFFLAGS)
+		$(AUTOCONF) ${AUTOCONFINCFLAGS}=$(CONFIG_RELTOPDIR) $(AUTOCONFFLAGS)
 	-$(RM) -r $(srcdir)/$(thisconfigdir)/autom4te.cache
 
 RECURSE_TARGETS=all-recurse clean-recurse distclean-recurse install-recurse \
diff --git a/src/config/pre.in b/src/config/pre.in
index 01d4b1e..ff162cc 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -173,6 +173,7 @@ LEXLIB = @LEXLIB@
 YACC = @YACC@
 AUTOCONF = @AUTOCONF@
 AUTOCONFFLAGS = @AUTOCONFFLAGS@
+AUTOCONFINCFLAGS = @AUTOCONFINCFLAGS@
 AUTOHEADER = @AUTOHEADER@
 AUTOHEADERFLAGS = @AUTOHEADERFLAGS@
 
diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 82e36c0..659661d 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-13  Ezra Peisach  <epeisach@bu.edu>
+
+	* reconf: For pre autoconf 2.54 - invoke autoreconf with -l for
+	localdir. Posr 2.54 use the -I option.
+
 2002-09-27  Tom Yu  <tlyu@mit.edu>
 
 	* depgen.sed: Solaris sed doesn't like '\(^.*$\)'; replace it with
diff --git a/src/util/reconf b/src/util/reconf
index 48ebb30..c246272 100644
--- a/src/util/reconf
+++ b/src/util/reconf
@@ -5,6 +5,7 @@ autoreconfprog=autoreconf
 localdir=.
 autoreconfoptions=""
 verbose=false
+localdirarg=
 
 autoreconf="/bin/sh $autoreconfprog"
 
@@ -74,6 +75,19 @@ if autoreconf --version | sed -e "$sedcmd1" -e "$sedcmd2" | egrep "$patb" >/dev/
 	  *)
 	       ;;
 	esac
+
+	# Determine the proper argument to autoreconf 
+	case "$autoconfversion" in
+	  2.1*)
+	       localdirarg="-l"
+	       ;;
+	  2.5[23])
+	       localdirarg="-l"
+	       ;;
+	    *)
+	       localdirarg="-I"
+	       ;;
+	esac
 else
 	echo "Couldn't find autoconf 2.13 or higher in your path."
 	echo " "
@@ -82,9 +96,9 @@ else
 fi
 
 if $verbose ; then 
-	echo $autoreconf $autoreconfoptions -l $localdir --verbose $force 
+	echo $autoreconf $autoreconfoptions $localdirarg $localdir --verbose $force
 fi
-$autoreconf $autoreconfoptions  -l $localdir --verbose $force || exit 1
+$autoreconf $autoreconfoptions  $localdirarg $localdir --verbose $force || exit 1
 if test $? = 0 ; then
     if test ! -d include/krb5/autoconf.stmp ; then
 	cp /dev/null include/krb5/autoconf.stmp