From 8f604f00a4abf33fc0311bde48357bfbd19fc36d Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 23 Apr 2008 10:24:41 +0000 Subject: [PATCH] 2008-04-23 Paolo Bonzini * confsubdir.m4: Remove. * override.m4: Apply _AC_ARG_VALIDATE fix to all versions but 2.62. --- config/ChangeLog | 13 +++-- config/confsubdir.m4 | 127 ------------------------------------------- config/override.m4 | 10 ++-- 3 files changed, 13 insertions(+), 137 deletions(-) delete mode 100644 config/confsubdir.m4 diff --git a/config/ChangeLog b/config/ChangeLog index ff7f8ba4c38..32c912682a6 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,16 +1,17 @@ +2008-04-23 Paolo Bonzini + + * override.m4: Apply _AC_ARG_VALIDATE fix to all versions + but 2.62. + 2008-04-18 Paolo Bonzini PR bootstrap/35457 - * override.m4: Add this. Make sure aclocal always picks it. + * confsubdir.m4: Rename to... + * override.m4: ... this. Make sure aclocal always picks it. Add more lenient precious variable check, backported from autoconf trunk. - (note: I left confsubdir.m4 for the moment until all the - configure scripts are regenerated. When confsubdir.m4 is - removed, this note should be removed too and config/ChangeLog - should be synced with gcc's). - 2008-04-04 Nick Clifton PR binutils/4334 diff --git a/config/confsubdir.m4 b/config/confsubdir.m4 deleted file mode 100644 index 4e1e8c4641c..00000000000 --- a/config/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 != 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" != yes; then - - # Remove --cache-file and --srcdir arguments so they do not pile up. - ac_sub_configure_args= - ac_prev= - eval "set x $ac_configure_args" - shift - for ac_arg - do - if test -n "$ac_prev"; then - ac_prev= - continue - fi - case $ac_arg in - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ - | --c=*) - ;; - --config-cache | -C) - ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - ;; - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - ;; - *) - case $ac_arg in - *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;; - esac - done - - # Always prepend --prefix to ensure using the same prefix - # in subdir configurations. - ac_arg="--prefix=$prefix" - case $ac_arg in - *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - ac_sub_configure_args="$ac_arg $ac_sub_configure_args" - - ac_popdir=`pwd` - for ac_dir in : $subdirs; do test "x$ac_dir" = 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=$ac_srcdir/configure.gnu - elif test -f "$ac_srcdir/configure"; then - ac_sub_configure=$ac_srcdir/configure - elif test -f "$ac_srcdir/configure.in"; then - # This should be Cygnus configure. - ac_sub_configure=$ac_aux_dir/configure - else - AC_MSG_WARN([no configuration information is in $ac_dir]) - ac_sub_configure= - 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=$cache_file ;; - *) # Relative path. - ac_sub_cache_file=$ac_top_builddir$cache_file ;; - esac - - AC_MSG_NOTICE([running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir]) - # The eval makes quoting arguments work. - eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ - --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || - AC_MSG_ERROR([$ac_sub_configure failed for $ac_dir]) - fi - - cd "$ac_popdir" - done -fi -])# _AC_OUTPUT_SUBDIRS -])]) diff --git a/config/override.m4 b/config/override.m4 index 4838a7da95d..592f64139b6 100644 --- a/config/override.m4 +++ b/config/override.m4 @@ -17,14 +17,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 AC_DEFUN a commonly used macro so this file is picked up. +[dnl AC_DEFUN a commonly used macro so this file is picked up. m4_copy([AC_PREREQ], [_AC_PREREQ]) AC_DEFUN([AC_PREREQ], [frob]) m4_copy([_AC_PREREQ], [AC_PREREQ]) -dnl Override the broken macro. +ifelse(m4_PACKAGE_VERSION, [2.59], [ + # _AC_OUTPUT_SUBDIRS # ------------------ # This is a subroutine of AC_OUTPUT, but it does not go into @@ -127,6 +126,9 @@ if test "$no_recursion" != yes; then done fi ])# _AC_OUTPUT_SUBDIRS +]) + +ifelse(m4_PACKAGE_VERSION, [2.62],, [ # _AC_ARG_VAR_VALIDATE # -------------------- -- 2.30.2