2010-06-10 Paolo Bonzini <bonzini@gnu.org>

* override.m4: Remove obsolete (<2.64) definitions.

config/ChangeLog

@@ -1,3 +1,7 @@
+2010-06-10  Paolo Bonzini  <bonzini@gnu.org>
+
+	* override.m4: Remove obsolete (<2.64) definitions.
+
 2010-06-09  Iain Sandoe  <iains@gcc.gnu.org>
 
 	PR bootstrap/43170

config/override.m4

@@ -1,9 +1,5 @@
-dnl Fix Autoconf-2.59 bugs: by overriding broken internal
+dnl Fix Autoconf bugs by overriding broken internal Autoconf
-dnl Autoconf macros with backports of the 2.60+ fix.
+dnl macros with backports of fixes from newer releases.
-dnl - AC_CONFIG_SUBDIRS whitespace mangling,
-dnl - more lenient precious variable checks
-dnl - better configure error message
-dnl - reliance on non-Posix m4wrap (M4 1.6 or newer implement FIFO)
 dnl
 dnl The override bits of this file should be a no-op for the newest
 dnl Autoconf version, which means they can be removed once the complete
@@ -12,6 +8,9 @@ dnl
 dnl The _GCC_AUTOCONF_VERSION_TEST ensures that exactly the desired
 dnl Autoconf version is used.  It should be kept for consistency.
 
+dnl Use ifdef/ifelse over m4_ifdef/m4_ifelse to be clean for 2.13.
+ifdef([m4_PACKAGE_VERSION], [
+
 dnl Provide m4_copy_force and m4_rename_force for old Autoconf versions.
 
 m4_ifndef([m4_copy_force],
@@ -22,17 +21,7 @@ m4_ifndef([m4_rename_force],
 [m4_define([m4_rename_force],
 [m4_ifdef([$2], [m4_undefine([$2])])m4_rename($@)])])
 
-dnl m4_PACKAGE_VERSION is an undocumented Autoconf macro.
+dnl AC_DEFUN a commonly used macro so this file is picked up.
-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],
-[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_force([_AC_PREREQ], [AC_PREREQ])
@@ -59,220 +48,12 @@ _GCC_AUTOCONF_VERSION_CHECK
 ])
 
 
-dnl Turn AC_DISABLE_OPTION_CHECKING into a no-op if not defined.
-m4_ifndef([AC_DISABLE_OPTION_CHECKING],
-  [m4_define([AC_DISABLE_OPTION_CHECKING])])
-
-
 dnl Fix 2.64 cross compile detection for AVR and RTEMS
 dnl by not trying to compile fopen.
 m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.64],
   [m4_foreach([_GCC_LANG], [C, C++, Fortran, Fortran 77],
      [m4_define([_AC_LANG_IO_PROGRAM(]_GCC_LANG[)], m4_defn([AC_LANG_PROGRAM(]_GCC_LANG[)]))])])
 
-
-m4_version_prereq([2.60],, [
-dnl We use $ac_pwd in some of the overrides below; ensure its definition
-m4_divert_push([PARSE_ARGS])dnl
-ac_pwd=`pwd`
-m4_divert_pop([PARSE_ARGS])dnl
-])
-
-
-m4_version_prereq([2.60],, [
-
-# _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
-])
-
-m4_version_prereq([2.63],, [
-
-# _AC_ARG_VAR_VALIDATE
-# --------------------
-# The code is the same as autoconf 2.59, but with a more lenient check
-# on precious variables and an output of pwd that have been added in
-# autoconf 2.62.
-m4_define([_AC_ARG_VAR_VALIDATE],
-[m4_divert_text([INIT_PREPARE],
-[# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([[a-zA-Z_0-9]]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      AS_MESSAGE([error: `$ac_var' was set to `$ac_old_val' in the previous run], 2)
-      ac_cache_corrupted=: ;;
-    ,set)
-      AS_MESSAGE([error: `$ac_var' was not set in the previous run], 2)
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-        # differences in whitespace do not lead to failure.
-        ac_old_val_w=`echo x $ac_old_val`
-        ac_new_val_w=`echo x $ac_new_val`
-        if test "$ac_old_val_w" != "$ac_new_val_w"; then
-          AS_MESSAGE([error: `$ac_var' has changed since the previous run:], 2)
-          ac_cache_corrupted=:
-        else
-          AS_MESSAGE([warning: ignoring whitespace changes in `$ac_var' since the previous run:], 2)
-          eval $ac_var=\$ac_old_val
-        fi
-        AS_MESSAGE([  former value:  `$ac_old_val'], 2)
-        AS_MESSAGE([  current value: `$ac_new_val'], 2)
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-dnl If you change this globbing pattern, test it on an old shell --
-dnl it's sensitive.  Putting any kind of quote in it causes syntax errors.
-[    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)]
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  AS_MESSAGE([error: in `$ac_pwd':], 2)
-  AS_MESSAGE([error: changes in the environment can compromise the build], 2)
-  AS_ERROR([run `make distclean' and/or `rm $cache_file' and start over])
-fi])dnl
-])# _AC_ARG_VAR_VALIDATE
-])
-
-m4_version_prereq([2.63],, [
-
-# AC_MSG_FAILURE(ERROR, [EXIT-STATUS = 1])
-# ----------------------------------------
-# This is the same code as in 2.59 and 2.61, except it also outputs pwd.
-m4_define([AC_MSG_FAILURE],
-[{ AS_MESSAGE([error: in `$ac_pwd':], 2)
-AC_MSG_ERROR([$1
-See `config.log' for more details.], [$2]); }])
-])
-])
-
-m4_version_prereq([2.60],, [
-dnl M4 1.6 and newer implement m4wrap using FIFO semantics, as required
-dnl by Posix; earlier versions used LIFO semantics.  Unfortunately,
-dnl Autoconf versions before 2.60 require those LIFO semantics, so
-dnl make sure to give it to them.
-m4_define([m4_wrap], [m4_ifdef([_$0_text],
-  [m4_define([_$0_text], [$1]m4_defn([_$0_text]))],
-  [m4_define([_$0_text], [$1])m4_builtin([m4wrap],
-    [m4_default(m4_defn([_$0_text])m4_undefine([_$0_text]))])])])
-])
-
 m4_version_prereq([2.66],, [
 dnl We need AC_CHECK_DECL which works for overloaded C++ functions.
 
@@ -313,3 +94,5 @@ m4_define([_AC_CHECK_DECLS],
 [m4_ifvaln([$2$3], [AS_IF([test $ac_have_decl = 1], [$2], [$3])])])
 
 ])
+
+])