require autoconf-2.69 exactly

The newlib & libgloss dirs are already generated using autoconf-2.69.
To avoid merging new code and/or accidental regeneration using diff
versions, leverage config/override.m4 to pin to 2.69 exactly.  This
matches what gcc/binutils/gdb are already doing.

The README file already says to use autoconf-2.69.

To accomplish this, it's just as simple as adding -I flags to the
top-level config/ dir when running aclocal.  This is because the
override.m4 file overrides AC_INIT to first require the specific
autoconf version before calling the real AC_INIT.

5 files changed, 12 insertions, 26 deletions

diff --git a/newlib/libm/machine/mips/Makefile.am b/newlib/libm/machine/mips/Makefile.am
index 5db49db62..eb6db78e9 100644
--- a/newlib/libm/machine/mips/Makefile.am
+++ b/newlib/libm/machine/mips/Makefile.am
@@ -26,5 +26,5 @@ lib_a-fenv.o: fenv.c
 lib_a-fenv.obj: fenv.c
 	$(COMPILE) -mno-mips16 -c -o $@ `if test -f 'fenv.c'; then $(CYGPATH_W) 'fenv.c'; else $(CYGPATH_W) '$(srcdir)/fenv.c'; fi`
 
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../..
+ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libm/machine/mips/Makefile.in b/newlib/libm/machine/mips/Makefile.in
index 16c4f7fb8..20a58906e 100644
--- a/newlib/libm/machine/mips/Makefile.in
+++ b/newlib/libm/machine/mips/Makefile.in
@@ -57,8 +57,10 @@ DIST_COMMON = $(srcdir)/../../../Makefile.shared $(srcdir)/Makefile.in \
 	$(am__configure_deps) $(srcdir)/../../../../mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../../acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../../../../config/depstand.m4 \
+	$(top_srcdir)/../../../../config/lead-dot.m4 \
+	$(top_srcdir)/../../../../config/override.m4 \
+	$(top_srcdir)/../../../acinclude.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -243,7 +245,7 @@ CLEANFILES = $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES)
 LIBADD_OBJS = \
 	lib_a-fenv.$(OBJEXT)
 
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../..
+ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
 all: all-am
 
diff --git a/newlib/libm/machine/mips/aclocal.m4 b/newlib/libm/machine/mips/aclocal.m4
index f721fa56b..7b3f348d3 100644
--- a/newlib/libm/machine/mips/aclocal.m4
+++ b/newlib/libm/machine/mips/aclocal.m4
@@ -579,27 +579,6 @@ if test x"${install_sh}" != xset; then
 fi
 AC_SUBST(install_sh)])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
@@ -1066,4 +1045,7 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../../../../config/depstand.m4])
+m4_include([../../../../config/lead-dot.m4])
+m4_include([../../../../config/override.m4])
 m4_include([../../../acinclude.m4])
diff --git a/newlib/libm/machine/mips/configure b/newlib/libm/machine/mips/configure
index cc0372576..cbd94f20e 100755
--- a/newlib/libm/machine/mips/configure
+++ b/newlib/libm/machine/mips/configure
@@ -1833,6 +1833,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
+
 ac_aux_dir=
 for ac_dir in ../../../.. "$srcdir"/../../../..; do
   if test -f "$ac_dir/install-sh"; then
diff --git a/newlib/libm/machine/mips/configure.ac b/newlib/libm/machine/mips/configure.ac
index 7a22fa31c..0ab0cf13f 100644
--- a/newlib/libm/machine/mips/configure.ac
+++ b/newlib/libm/machine/mips/configure.ac
@@ -1,5 +1,4 @@
 
-AC_PREREQ(2.59)
 AC_INIT([newlib],[NEWLIB_VERSION])
 AC_CONFIG_SRCDIR([Makefile.am])