From a100e80fc9a9243c913035c3d40bf8ec4dc5c6fc Mon Sep 17 00:00:00 2001 From: Mike Frysinger 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. --- newlib/aclocal.m4 | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'newlib/aclocal.m4') diff --git a/newlib/aclocal.m4 b/newlib/aclocal.m4 index 16a489462..61cb2c842 100644 --- a/newlib/aclocal.m4 +++ b/newlib/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,6 +1045,9 @@ 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([../libtool.m4]) m4_include([../ltoptions.m4]) m4_include([../ltsugar.m4]) -- cgit v1.2.3