From 9abe4a663b3c2836c281d0431381e850b3feb174 Mon Sep 17 00:00:00 2001 From: rwild Date: Thu, 30 Jul 2009 19:41:13 +0000 Subject: [PATCH] config/ * extensions.m4 (AC_USE_SYSTEM_EXTENSIONS): Do not expand for Autoconf 2.62 or newer. * tls.m4 (GCC_CHECK_TLS): Fix m4 quotation. * no-executables.m4 (_AC_COMPILER_EXEEXT): Fix m4 quotation. * override.m4 (m4_copy_force, m4_rename_force): Provide macros if not defined. (AC_PREREQ): Use m4_copy_force. boehm-gc/ * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. libada/ * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. libffi/ * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. libgfortran/ * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. libgomp/ * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. libjava/ * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. libmudflap/ * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. libobjc/ * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. libssp/ * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. zlib/ * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. libstdc++-v3/ * acinclude.m4 (GLIBCXX_CONFIGURE): Use m4_rename_force. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150269 138bc75d-0d04-0410-961f-82ee72b054a4 --- boehm-gc/ChangeLog | 4 ++++ boehm-gc/configure.ac | 2 +- config/ChangeLog | 10 ++++++++++ config/extensions.m4 | 7 +++++-- config/no-executables.m4 | 4 ++-- config/override.m4 | 12 +++++++++++- config/tls.m4 | 4 ++-- libada/ChangeLog | 4 ++++ libada/configure.ac | 2 +- libffi/ChangeLog | 4 ++++ libffi/configure.ac | 2 +- libgfortran/ChangeLog | 4 ++++ libgfortran/configure.ac | 2 +- libgomp/ChangeLog | 4 ++++ libgomp/configure.ac | 2 +- libjava/ChangeLog | 4 ++++ libjava/configure.ac | 2 +- libmudflap/ChangeLog | 4 ++++ libmudflap/configure.ac | 2 +- libobjc/ChangeLog | 4 ++++ libobjc/configure.ac | 2 +- libssp/ChangeLog | 4 ++++ libssp/configure.ac | 2 +- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/acinclude.m4 | 2 +- zlib/ChangeLog.gcj | 4 ++++ zlib/configure.ac | 2 +- 27 files changed, 85 insertions(+), 18 deletions(-) diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index fa53669..0e37031 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,7 @@ +2009-07-30 Ralf Wildenhues + + * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. + 2009-07-17 Michael Meissner PR boehm-gc/40785 diff --git a/boehm-gc/configure.ac b/boehm-gc/configure.ac index 2206f76..52ab0b5 100644 --- a/boehm-gc/configure.ac +++ b/boehm-gc/configure.ac @@ -49,7 +49,7 @@ m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) m4_define([_AC_ARG_VAR_PRECIOUS],[]) AC_PROG_CC AC_PROG_CXX -m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) +m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) AM_PROG_CC_C_O diff --git a/config/ChangeLog b/config/ChangeLog index 6bd7bbf..51d62d7 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,13 @@ +2009-07-30 Ralf Wildenhues + + * extensions.m4 (AC_USE_SYSTEM_EXTENSIONS): Do not expand + for Autoconf 2.62 or newer. + * tls.m4 (GCC_CHECK_TLS): Fix m4 quotation. + * no-executables.m4 (_AC_COMPILER_EXEEXT): Fix m4 quotation. + * override.m4 (m4_copy_force, m4_rename_force): Provide + macros if not defined. + (AC_PREREQ): Use m4_copy_force. + 2009-07-17 Joseph Myers PR other/40784 diff --git a/config/extensions.m4 b/config/extensions.m4 index 8ae4a67..eb59f27 100644 --- a/config/extensions.m4 +++ b/config/extensions.m4 @@ -1,7 +1,7 @@ -# serial 5 -*- Autoconf -*- +# serial 6 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006, 2007, 2009 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. @@ -12,6 +12,8 @@ # enough in this area it's likely we'll need to redefine # AC_USE_SYSTEM_EXTENSIONS for quite some time. +m4_version_prereq([2.62],, [ + # AC_USE_SYSTEM_EXTENSIONS # ------------------------ # Enable extensions on systems that normally disable them, @@ -74,3 +76,4 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl AC_DEFINE([_TANDEM_SOURCE]) ])# AC_USE_SYSTEM_EXTENSIONS +]) diff --git a/config/no-executables.m4 b/config/no-executables.m4 index c4d0b70..9061624 100644 --- a/config/no-executables.m4 +++ b/config/no-executables.m4 @@ -25,7 +25,7 @@ AC_BEFORE([$0], [_AC_COMPILER_EXEEXT]) AC_BEFORE([$0], [AC_LINK_IFELSE]) m4_define([_AC_COMPILER_EXEEXT], -AC_LANG_CONFTEST([AC_LANG_PROGRAM()]) +[AC_LANG_CONFTEST([AC_LANG_PROGRAM()]) # FIXME: Cleanup? AS_IF([AC_TRY_EVAL(ac_link)], [gcc_no_link=no], [gcc_no_link=yes]) if test x$gcc_no_link = xyes; then @@ -35,7 +35,7 @@ if test x$gcc_no_link = xyes; then cross_compiling=yes EXEEXT= else - m4_defn([_AC_COMPILER_EXEEXT])dnl + ]m4_defn([_AC_COMPILER_EXEEXT])dnl fi ) diff --git a/config/override.m4 b/config/override.m4 index 9bb1496..bf112db 100644 --- a/config/override.m4 +++ b/config/override.m4 @@ -12,6 +12,16 @@ dnl dnl The _GCC_AUTOCONF_VERSION_TEST ensures that exactly the desired dnl Autoconf version is used. It should be kept for consistency. +dnl Provide m4_copy_force and m4_rename_force for old Autoconf versions. + +m4_ifndef([m4_copy_force], +[m4_define([m4_copy_force], +[m4_ifdef([$2], [m4_undefine([$2])])m4_copy($@)])]) + +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 We use it because this fix is intended for 2.59 only. dnl A feature test for the broken AC_CONFIG_SUBDIRS instead @@ -25,7 +35,7 @@ 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([_AC_PREREQ], [AC_PREREQ]) +m4_copy_force([_AC_PREREQ], [AC_PREREQ]) dnl Ensure exactly this Autoconf version is used diff --git a/config/tls.m4 b/config/tls.m4 index 099bdc2..ef7e6d0 100644 --- a/config/tls.m4 +++ b/config/tls.m4 @@ -11,8 +11,8 @@ AC_DEFUN([GCC_CHECK_TLS], [ chktls_save_LDFLAGS="$LDFLAGS" LDFLAGS="-static $LDFLAGS" AC_LINK_IFELSE([int main() { return 0; }], - AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }], - [gcc_cv_have_tls=yes], [gcc_cv_have_tls=no],[]), + [AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }], + [gcc_cv_have_tls=yes], [gcc_cv_have_tls=no],[])], [gcc_cv_have_tls=yes]) LDFLAGS="$chktls_save_LDFLAGS" if test $gcc_cv_have_tls = yes; then diff --git a/libada/ChangeLog b/libada/ChangeLog index fc48aa1..2be7dff 100644 --- a/libada/ChangeLog +++ b/libada/ChangeLog @@ -1,3 +1,7 @@ +2009-07-30 Ralf Wildenhues + + * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. + 2009-07-13 Eric Botcazou * configure.ac: Include multi.m4 and do not call AC_CANONICAL_SYSTEM. diff --git a/libada/configure.ac b/libada/configure.ac index 12de547..ef9e613 100644 --- a/libada/configure.ac +++ b/libada/configure.ac @@ -92,7 +92,7 @@ AC_SUBST(toolexeclibdir) m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) m4_define([_AC_ARG_VAR_PRECIOUS],[]) AC_PROG_CC -m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) +m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) AC_SUBST(CFLAGS) diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 9af1e44..2fc3b1a 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,7 @@ +2009-07-30 Ralf Wildenhues + + * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. + 2009-07-24 Dave Korn PR libffi/40807 diff --git a/libffi/configure.ac b/libffi/configure.ac index 2ab5902..ab693bb 100644 --- a/libffi/configure.ac +++ b/libffi/configure.ac @@ -22,7 +22,7 @@ AM_INIT_AUTOMAKE m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) m4_define([_AC_ARG_VAR_PRECIOUS],[]) AC_PROG_CC -m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) +m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) AC_SUBST(CFLAGS) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index aec1427..433be33 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,7 @@ +2009-07-30 Ralf Wildenhues + + * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. + 2009-07-27 Tobias Burnus PR fortran/40863 diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac index b1e5d1e..1fadd2e 100644 --- a/libgfortran/configure.ac +++ b/libgfortran/configure.ac @@ -119,7 +119,7 @@ AC_SUBST(toolexeclibdir) m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) m4_define([_AC_ARG_VAR_PRECIOUS],[]) AC_PROG_CC -m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) +m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) # Add -Wall -fno-repack-arrays -fno-underscoring if we are using GCC. if test "x$GCC" = "xyes"; then diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 5ef1785..e10c455 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,7 @@ +2009-07-30 Ralf Wildenhues + + * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. + 2009-07-16 Joseph Myers * configure: Regenerate. diff --git a/libgomp/configure.ac b/libgomp/configure.ac index db8e281..9a026a2 100644 --- a/libgomp/configure.ac +++ b/libgomp/configure.ac @@ -103,7 +103,7 @@ AC_SUBST(toolexeclibdir) m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) m4_define([_AC_ARG_VAR_PRECIOUS],[]) AC_PROG_CC -m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) +m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) AC_SUBST(CFLAGS) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 02fc607..a4784e51 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2009-07-30 Ralf Wildenhues + + * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. + 2009-07-28 David Daney * gnu/gcj/util/natGCInfo.cc (nomem_handler): Use oomDumpName as diff --git a/libjava/configure.ac b/libjava/configure.ac index 3074a0c..1ab5bec 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -159,7 +159,7 @@ CXXFLAGS="$CXXFLAGS -fno-builtin" AC_PROG_CC AC_PROG_CXX CXXFLAGS="$save_CXXFLAGS" -m4_rename([glibcxx_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) +m4_rename_force([glibcxx_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) AC_SUBST(LDFLAGS) diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog index edb0958..2312b20 100644 --- a/libmudflap/ChangeLog +++ b/libmudflap/ChangeLog @@ -1,3 +1,7 @@ +2009-07-30 Ralf Wildenhues + + * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. + 2009-07-16 Joseph Myers * configure: Regenerate. diff --git a/libmudflap/configure.ac b/libmudflap/configure.ac index 8ce99a1..c7d69d5 100644 --- a/libmudflap/configure.ac +++ b/libmudflap/configure.ac @@ -39,7 +39,7 @@ AC_LANG_C m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) m4_define([_AC_ARG_VAR_PRECIOUS],[]) AC_PROG_CC -m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) +m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) AC_SUBST(CFLAGS) diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 88f8b8d..fa6022b 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,7 @@ +2009-07-30 Ralf Wildenhues + + * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. + 2009-04-09 Nick Clifton * sendmsg.c: Change copyright header to refer to version 3 of diff --git a/libobjc/configure.ac b/libobjc/configure.ac index dd7751e..036e34c 100644 --- a/libobjc/configure.ac +++ b/libobjc/configure.ac @@ -153,7 +153,7 @@ GCC_NO_EXECUTABLES m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) m4_define([_AC_ARG_VAR_PRECIOUS],[]) AC_PROG_CC -m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) +m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) # extra LD Flags which are required for targets case "${host}" in diff --git a/libssp/ChangeLog b/libssp/ChangeLog index d8d3c74..89d23ae 100644 --- a/libssp/ChangeLog +++ b/libssp/ChangeLog @@ -1,3 +1,7 @@ +2009-07-30 Ralf Wildenhues + + * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. + 2009-04-13 Ozkan Sezer PR target/39062 diff --git a/libssp/configure.ac b/libssp/configure.ac index f3a66ec..ff6f2de 100644 --- a/libssp/configure.ac +++ b/libssp/configure.ac @@ -41,7 +41,7 @@ AC_LANG_C m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) m4_define([_AC_ARG_VAR_PRECIOUS],[]) AC_PROG_CC -m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) +m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) AC_SUBST(CFLAGS) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3951601..dc78dbd 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2009-07-30 Ralf Wildenhues + + * acinclude.m4 (GLIBCXX_CONFIGURE): Use m4_rename_force. + 2009-07-30 Paolo Carlini PR libstdc++/40915 diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index d7895f5..b0b6241 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -104,7 +104,7 @@ AC_DEFUN([GLIBCXX_CONFIGURE], [ AC_PROG_CC AC_PROG_CXX CXXFLAGS="$save_CXXFLAGS" - m4_rename([glibcxx_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) + m4_rename_force([glibcxx_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj index eee68cd..2570352 100644 --- a/zlib/ChangeLog.gcj +++ b/zlib/ChangeLog.gcj @@ -1,3 +1,7 @@ +2009-07-30 Ralf Wildenhues + + * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. + 2009-03-01 Ralf Wildenhues * configure: Regenerate. diff --git a/zlib/configure.ac b/zlib/configure.ac index c85f4d5..febe9e3 100644 --- a/zlib/configure.ac +++ b/zlib/configure.ac @@ -54,7 +54,7 @@ GCC_NO_EXECUTABLES m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) m4_define([_AC_ARG_VAR_PRECIOUS],[]) AC_PROG_CC -m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) +m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) AC_SUBST(CFLAGS) -- 2.7.4