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, 25 deletions

diff --git a/libgloss/wince/Makefile.am b/libgloss/wince/Makefile.am
index a6b74bce8..d32e4184c 100644
--- a/libgloss/wince/Makefile.am
+++ b/libgloss/wince/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I . -I ..
+ACLOCAL_AMFLAGS = -I . -I .. -I ../.. -I ../../config
 
 gdbdir = ${dir ${patsubst %/,%,${dir @srcdir@}}}gdb
 VPATH = $(gdbdir)
diff --git a/libgloss/wince/Makefile.in b/libgloss/wince/Makefile.in
index 00c32d844..0a29c954a 100644
--- a/libgloss/wince/Makefile.in
+++ b/libgloss/wince/Makefile.in
@@ -91,8 +91,10 @@ target_triplet = @target@
 bin_PROGRAMS = stub.exe$(EXEEXT)
 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)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -283,7 +285,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I . -I ..
+ACLOCAL_AMFLAGS = -I . -I .. -I ../.. -I ../../config
 gdbdir = ${dir ${patsubst %/,%,${dir @srcdir@}}}gdb
 stub_exe_SOURCES = wince-stub.c
 tooldir = $(exec_prefix)/$(host_alias)
diff --git a/libgloss/wince/aclocal.m4 b/libgloss/wince/aclocal.m4
index b802c7c59..c56a6ad26 100644
--- a/libgloss/wince/aclocal.m4
+++ b/libgloss/wince/aclocal.m4
@@ -626,25 +626,6 @@ if test x"${install_sh+set}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2017 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.
-
-# 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
 
@@ -1122,4 +1103,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/libgloss/wince/configure b/libgloss/wince/configure
index 190dc0393..43bf75694 100755
--- a/libgloss/wince/configure
+++ b/libgloss/wince/configure
@@ -1792,6 +1792,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+
+
+
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
diff --git a/libgloss/wince/configure.ac b/libgloss/wince/configure.ac
index 02b5bd8a1..d17b061ff 100644
--- a/libgloss/wince/configure.ac
+++ b/libgloss/wince/configure.ac
@@ -1,7 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.69)dnl
-
 AC_INIT(wince-stub, 1.0)
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM