2007-01-11 Paolo Bonzini <bonzini@gnu.org>
* config/warnings.m4: Add second parameter with name of variable. Always append to the variable if it exists.
This commit is contained in:
		| @@ -1,3 +1,8 @@ | |||||||
|  | 2007-01-11  Paolo Bonzini  <bonzini@gnu.org> | ||||||
|  |  | ||||||
|  | 	* config/warnings.m4: Add second parameter with name of variable. | ||||||
|  | 	Always append to the variable if it exists. | ||||||
|  |  | ||||||
| 2007-01-01  Mike Stump  <mrs@apple.com> | 2007-01-01  Mike Stump  <mrs@apple.com> | ||||||
|  |  | ||||||
| 	* mh-ppc-darwin: Remove support for building with Apple's gcc-3.1. | 	* mh-ppc-darwin: Remove support for building with Apple's gcc-3.1. | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # Autoconf include file defining macros related to compile-time warnings. | # Autoconf include file defining macros related to compile-time warnings. | ||||||
|  |  | ||||||
| # Copyright 2004, 2005 Free Software Foundation, Inc. | # Copyright 2004, 2005, 2007 Free Software Foundation, Inc. | ||||||
|  |  | ||||||
| #This file is part of GCC. | #This file is part of GCC. | ||||||
|  |  | ||||||
| @@ -19,13 +19,14 @@ | |||||||
| #Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA | #Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA | ||||||
| #02110-1301, USA. | #02110-1301, USA. | ||||||
|  |  | ||||||
| # ACX_PROG_CC_WARNING_OPTS([-Wfoo -Wbar -Wbaz]) | # ACX_PROG_CC_WARNING_OPTS(WARNINGS, [VARIABLE = WARN_CFLAGS@) | ||||||
| #   Sets @WARN_CFLAGS@ to the subset of the given options which the | #   Sets @VARIABLE@ to the subset of the given options which the | ||||||
| #   compiler accepts. | #   compiler accepts. | ||||||
| AC_DEFUN([ACX_PROG_CC_WARNING_OPTS], | AC_DEFUN([ACX_PROG_CC_WARNING_OPTS], | ||||||
| [AC_REQUIRE([AC_PROG_CC])dnl | [AC_REQUIRE([AC_PROG_CC])dnl | ||||||
| AC_SUBST([WARN_CFLAGS])dnl | m4_pushdef([acx_Var], [m4_default([$2], [WARN_CFLAGS])])dnl | ||||||
| WARN_CFLAGS= | AC_SUBST(acx_Var)dnl | ||||||
|  | acx_Var= | ||||||
| save_CFLAGS="$CFLAGS" | save_CFLAGS="$CFLAGS" | ||||||
| for option in $1; do | for option in $1; do | ||||||
|   AS_VAR_PUSHDEF([acx_Woption], [acx_cv_prog_cc_warning_$option]) |   AS_VAR_PUSHDEF([acx_Woption], [acx_cv_prog_cc_warning_$option]) | ||||||
| @@ -36,20 +37,22 @@ for option in $1; do | |||||||
|       [AS_VAR_SET(acx_Woption, no)]) |       [AS_VAR_SET(acx_Woption, no)]) | ||||||
|   ]) |   ]) | ||||||
|   AS_IF([test AS_VAR_GET(acx_Woption) = yes], |   AS_IF([test AS_VAR_GET(acx_Woption) = yes], | ||||||
|         [WARN_CFLAGS="$WARN_CFLAGS${WARN_CFLAGS:+ }$option"]) |         [acx_Var="$acx_Var${acx_Var:+ }$option"]) | ||||||
|   AS_VAR_POPDEF([acx_Woption])dnl |   AS_VAR_POPDEF([acx_Woption])dnl | ||||||
| done | done | ||||||
| CFLAGS="$save_CFLAGS" | CFLAGS="$save_CFLAGS" | ||||||
|  | m4_popdef([acx_Var])dnl | ||||||
| ])# ACX_PROG_CC_WARNING_OPTS | ])# ACX_PROG_CC_WARNING_OPTS | ||||||
|  |  | ||||||
| # ACX_PROG_CC_WARNING_ALMOST_PEDANTIC([-Wno-long-long ...]) | # ACX_PROG_CC_WARNING_ALMOST_PEDANTIC(WARNINGS, [VARIABLE = WARN_PEDANTIC) | ||||||
| #   Sets WARN_PEDANTIC to "-pedantic" + the argument, if the compiler is GCC | #   Append to VARIABLE "-pedantic" + the argument, if the compiler is GCC | ||||||
| #   and accepts all of those options simultaneously, otherwise to nothing. | #   and accepts all of those options simultaneously, otherwise to nothing. | ||||||
| AC_DEFUN([ACX_PROG_CC_WARNING_ALMOST_PEDANTIC], | AC_DEFUN([ACX_PROG_CC_WARNING_ALMOST_PEDANTIC], | ||||||
| [AC_REQUIRE([AC_PROG_CC])dnl | [AC_REQUIRE([AC_PROG_CC])dnl | ||||||
| AC_SUBST([WARN_PEDANTIC])dnl | m4_pushdef([acx_Var], [m4_default([$2], [WARN_PEDANTIC])])dnl | ||||||
|  | AC_SUBST(acx_Var)dnl | ||||||
| AS_VAR_PUSHDEF([acx_Pedantic], [acx_cv_prog_cc_pedantic_$1])dnl | AS_VAR_PUSHDEF([acx_Pedantic], [acx_cv_prog_cc_pedantic_$1])dnl | ||||||
| WARN_PEDANTIC= | acx_Var= | ||||||
| AS_IF([test "$GCC" = yes], | AS_IF([test "$GCC" = yes], | ||||||
| [AC_CACHE_CHECK([whether $CC supports -pedantic $1], acx_Pedantic, | [AC_CACHE_CHECK([whether $CC supports -pedantic $1], acx_Pedantic, | ||||||
| [save_CFLAGS="$CFLAGS" | [save_CFLAGS="$CFLAGS" | ||||||
| @@ -59,9 +62,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], | |||||||
|    [AS_VAR_SET(acx_Pedantic, no)]) |    [AS_VAR_SET(acx_Pedantic, no)]) | ||||||
| CFLAGS="$save_CFLAGS"]) | CFLAGS="$save_CFLAGS"]) | ||||||
| AS_IF([test AS_VAR_GET(acx_Pedantic) = yes], | AS_IF([test AS_VAR_GET(acx_Pedantic) = yes], | ||||||
|       [WARN_PEDANTIC="-pedantic $1"]) |       [acx_Var="$acx_Var${acx_Var:+ }-pedantic $1"]) | ||||||
| ]) | ]) | ||||||
| AS_VAR_POPDEF([acx_Pedantic])dnl | AS_VAR_POPDEF([acx_Pedantic])dnl | ||||||
|  | m4_popdef([acx_Var])dnl | ||||||
| ])# ACX_PROG_CC_WARNING_ALMOST_PEDANTIC | ])# ACX_PROG_CC_WARNING_ALMOST_PEDANTIC | ||||||
|  |  | ||||||
| # ACX_PROG_CC_WARNINGS_ARE_ERRORS([x.y.z]) | # ACX_PROG_CC_WARNINGS_ARE_ERRORS([x.y.z]) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user