From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id DEE253858409; Wed, 19 Jan 2022 00:33:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DEE253858409 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: drop autoconf-2.59 workaround X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: a492b260655a9ad67c24c8bbaa710bb3763d193e X-Git-Newrev: ac3d869afbf9f26cd6ea42e1c5acc0e498f6556b Message-Id: <20220119003342.DEE253858409@sourceware.org> Date: Wed, 19 Jan 2022 00:33:42 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jan 2022 00:33:43 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Dac3d869afbf= 9f26cd6ea42e1c5acc0e498f6556b commit ac3d869afbf9f26cd6ea42e1c5acc0e498f6556b Author: Mike Frysinger Date: Mon Jan 17 19:28:48 2022 -0500 newlib: drop autoconf-2.59 workaround =20 As the file comments say, this was a backport of an autoconf-2.60 fix, and shouldn't matter for >autoconf-2.59 versions. Drop it since we use and require autoconf-2.69 now. Diff: --- newlib/confsubdir.m4 | 127 -----------------------------------------------= ---- 1 file changed, 127 deletions(-) diff --git a/newlib/confsubdir.m4 b/newlib/confsubdir.m4 deleted file mode 100644 index 4e1e8c464..000000000 --- a/newlib/confsubdir.m4 +++ /dev/null @@ -1,127 +0,0 @@ -dnl Fix Autoconf-2.59 AC_CONFIG_SUBDIRS whitespace mangling, -dnl by overriding the broken internal Autoconf macro with a -dnl backport of the 2.60 fix. -dnl -dnl This file should be a no-op for Autoconf versions !=3D 2.59. -dnl It can be removed once the complete tree has moved to a -dnl newer Autoconf version. - -dnl m4_PACKAGE_VERSION is an undocumented Autoconf macro. -dnl We use it because this fix is intended for 2.59 only. -dnl A feature test for the broken AC_CONFIG_SUBDIRS instead -dnl would be better but is tricky. -dnl -dnl Use ifdef/ifelse over m4_ifdef/m4_ifelse to be clean for 2.13. -dnl Redefine AC_CONFIG_SUBDIRS so aclocal pulls in this file -dnl when needed. - -ifdef([m4_PACKAGE_VERSION], -[ifelse(m4_PACKAGE_VERSION, [2.59], [ - -dnl Redefine AC_CONFIG_SUBDIRS so this file is picked up if needed. -AC_DEFUN([AC_CONFIG_SUBDIRS], defn([AC_CONFIG_SUBDIRS])) - -dnl Override the broken macro. -# _AC_OUTPUT_SUBDIRS -# ------------------ -# This is a subroutine of AC_OUTPUT, but it does not go into -# config.status, rather, it is called after running config.status. -m4_define([_AC_OUTPUT_SUBDIRS], -[ -# -# CONFIG_SUBDIRS section, as fixed in confsubdir.m4. -# -if test "$no_recursion" !=3D yes; then - - # Remove --cache-file and --srcdir arguments so they do not pile up. - ac_sub_configure_args=3D - ac_prev=3D - eval "set x $ac_configure_args" - shift - for ac_arg - do - if test -n "$ac_prev"; then - ac_prev=3D - continue - fi - case $ac_arg in - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=3Dcache_file ;; - -cache-file=3D* | --cache-file=3D* | --cache-fil=3D* | --cache-fi=3D* \ - | --cache-f=3D* | --cache-=3D* | --cache=3D* | --cach=3D* | --cac=3D* = | --ca=3D* \ - | --c=3D*) - ;; - --config-cache | -C) - ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=3Dsrcdir ;; - -srcdir=3D* | --srcdir=3D* | --srcdi=3D* | --srcd=3D* | --src=3D* | --= sr=3D*) - ;; - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=3Dprefix ;; - -prefix=3D* | --prefix=3D* | --prefi=3D* | --pref=3D* | --pre=3D* | --= pr=3D* | --p=3D*) - ;; - *) - case $ac_arg in - *\'*) ac_arg=3D`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - ac_sub_configure_args=3D"$ac_sub_configure_args '$ac_arg'" ;; - esac - done - - # Always prepend --prefix to ensure using the same prefix - # in subdir configurations. - ac_arg=3D"--prefix=3D$prefix" - case $ac_arg in - *\'*) ac_arg=3D`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - ac_sub_configure_args=3D"$ac_arg $ac_sub_configure_args" - - ac_popdir=3D`pwd` - for ac_dir in : $subdirs; do test "x$ac_dir" =3D x: && continue - - # Do not complain, so a configure script can configure whichever - # parts of a large source tree are present. - test -d "$srcdir/$ac_dir" || continue - - AC_MSG_NOTICE([configuring in $ac_dir]) - AS_MKDIR_P(["$ac_dir"]) - _AC_SRCPATHS(["$ac_dir"]) - - cd "$ac_dir" - - # Check for guested configure; otherwise get Cygnus style configure. - if test -f "$ac_srcdir/configure.gnu"; then - ac_sub_configure=3D$ac_srcdir/configure.gnu - elif test -f "$ac_srcdir/configure"; then - ac_sub_configure=3D$ac_srcdir/configure - elif test -f "$ac_srcdir/configure.in"; then - # This should be Cygnus configure. - ac_sub_configure=3D$ac_aux_dir/configure - else - AC_MSG_WARN([no configuration information is in $ac_dir]) - ac_sub_configure=3D - fi - - # The recursion is here. - if test -n "$ac_sub_configure"; then - # Make the cache file name correct relative to the subdirectory. - case $cache_file in - [[\\/]]* | ?:[[\\/]]* ) ac_sub_cache_file=3D$cache_file ;; - *) # Relative path. - ac_sub_cache_file=3D$ac_top_builddir$cache_file ;; - esac - - AC_MSG_NOTICE([running $SHELL $ac_sub_configure $ac_sub_configure_ar= gs --cache-file=3D$ac_sub_cache_file --srcdir=3D$ac_srcdir]) - # The eval makes quoting arguments work. - eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ - --cache-file=3D\"\$ac_sub_cache_file\" --srcdir=3D\"\$ac_srcdir\"" || - AC_MSG_ERROR([$ac_sub_configure failed for $ac_dir]) - fi - - cd "$ac_popdir" - done -fi -])# _AC_OUTPUT_SUBDIRS -])])