From a100e80fc9a9243c913035c3d40bf8ec4dc5c6fc Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 30 Dec 2021 13:29:02 -0500
Subject: 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.
---
 libgloss/sparc/aclocal.m4          | 22 +++-------------------
 libgloss/sparc/configure           |  3 +++
 libgloss/sparc/configure.ac        |  1 -
 libgloss/sparc/libsys/aclocal.m4   | 22 +++-------------------
 libgloss/sparc/libsys/configure    |  3 +++
 libgloss/sparc/libsys/configure.ac |  1 -
 6 files changed, 12 insertions(+), 40 deletions(-)

(limited to 'libgloss/sparc')

diff --git a/libgloss/sparc/aclocal.m4 b/libgloss/sparc/aclocal.m4
index f3492ee..24271f3 100644
--- a/libgloss/sparc/aclocal.m4
+++ b/libgloss/sparc/aclocal.m4
@@ -310,25 +310,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# 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])])
-
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
 # Copyright (C) 2001-2017 Free Software Foundation, Inc.
@@ -396,4 +377,7 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/depstand.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
 m4_include([../acinclude.m4])
diff --git a/libgloss/sparc/configure b/libgloss/sparc/configure
index 19f26ef..231add6 100755
--- a/libgloss/sparc/configure
+++ b/libgloss/sparc/configure
@@ -1763,6 +1763,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
+
 if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
diff --git a/libgloss/sparc/configure.ac b/libgloss/sparc/configure.ac
index 32b0db8..849ef0c 100644
--- a/libgloss/sparc/configure.ac
+++ b/libgloss/sparc/configure.ac
@@ -10,7 +10,6 @@
 # the new terms are clearly indicated on the first page of each file where
 # they apply.
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.69)dnl
 AC_INIT(sparc-stub.c)
 
 if test "${enable_shared}" = "yes" ; then
diff --git a/libgloss/sparc/libsys/aclocal.m4 b/libgloss/sparc/libsys/aclocal.m4
index 2fb5483..5ca7019 100644
--- a/libgloss/sparc/libsys/aclocal.m4
+++ b/libgloss/sparc/libsys/aclocal.m4
@@ -310,25 +310,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# 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])])
-
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
 # Copyright (C) 2001-2017 Free Software Foundation, Inc.
@@ -396,4 +377,7 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../../config/depstand.m4])
+m4_include([../../../config/lead-dot.m4])
+m4_include([../../../config/override.m4])
 m4_include([../../acinclude.m4])
diff --git a/libgloss/sparc/libsys/configure b/libgloss/sparc/libsys/configure
index 9ba58d6..78603df 100755
--- a/libgloss/sparc/libsys/configure
+++ b/libgloss/sparc/libsys/configure
@@ -1740,6 +1740,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/libgloss/sparc/libsys/configure.ac b/libgloss/sparc/libsys/configure.ac
index 0a0be90..4a2afb1 100644
--- a/libgloss/sparc/libsys/configure.ac
+++ b/libgloss/sparc/libsys/configure.ac
@@ -15,7 +15,6 @@
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.69)dnl
 AC_INIT(libsys-crt0.S)
 
 AC_CONFIG_AUX_DIR(../../..)
-- 
cgit v1.1