diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2016-12-07 01:08:44 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2016-12-07 15:53:13 +0000 |
| commit | f91def038449dbd6d9125fd1671128a3e19ca6fb (patch) | |
| tree | 730d3b8c310209a0f3db4aac74ce90eabf97fe35 /m4/warnings.m4 | |
| parent | cdeb5dda0a62924a0bbf92f890db38c44da9ee23 (diff) | |
| download | strace-f91def038449dbd6d9125fd1671128a3e19ca6fb.tar.gz | |
m4: prepare gl_WARN_ADD for simultaneous use of multiple compilers
* m4/warnings.m4 (gl_COMPILER_OPTION_IF): Change gl_Flags to use
_AC_LANG_PREFIX[]FLAGS in unquoted form. Change gl_Warn to use gl_Flags
instead of _AC_LANG_ABBREV. Change notification message to mention
the variable name of the compiler.
(gl_UNKNOWN_WARNINGS_ARE_ERRORS): Do nothing if
gl_unknown_warnings_are_errors is set.
(gl_WARN_ADD): Change the use of gl_UNKNOWN_WARNINGS_ARE_ERRORS from
AC_REQUIRE to a regular call.
Diffstat (limited to 'm4/warnings.m4')
| -rw-r--r-- | m4/warnings.m4 | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/m4/warnings.m4 b/m4/warnings.m4 index e3d239b64..1917b5b93 100644 --- a/m4/warnings.m4 +++ b/m4/warnings.m4 @@ -1,4 +1,5 @@ # warnings.m4 serial 11 +# modified for strace project dnl Copyright (C) 2008-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -23,8 +24,8 @@ m4_ifdef([AS_VAR_APPEND], # FIXME: gl_Warn must be used unquoted until we can assume Autoconf # 2.64 or newer. AC_DEFUN([gl_COMPILER_OPTION_IF], -[AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_[]_AC_LANG_ABBREV[]_$1])dnl -AS_VAR_PUSHDEF([gl_Flags], [_AC_LANG_PREFIX[]FLAGS])dnl +[AS_VAR_PUSHDEF([gl_Flags], _AC_LANG_PREFIX[]FLAGS)dnl +AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_[]gl_Flags[]_$1])dnl AS_LITERAL_IF([$1], [m4_pushdef([gl_Positive], m4_bpatsubst([$1], [^-Wno-], [-W]))], [gl_positive="$1" @@ -32,7 +33,7 @@ case $gl_positive in -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;; esac m4_pushdef([gl_Positive], [$gl_positive])])dnl -AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]), [ +AC_CACHE_CHECK([whether $[]_AC_CC[] handles $1], m4_defn([gl_Warn]), [ gl_save_compiler_FLAGS="$gl_Flags" gl_AS_VAR_APPEND(m4_defn([gl_Flags]), [" $gl_unknown_warnings_are_errors ]m4_defn([gl_Positive])["]) @@ -52,9 +53,12 @@ AS_VAR_POPDEF([gl_Warn])dnl # Clang doesn't complain about unknown warning options unless one also # specifies -Wunknown-warning-option -Werror. Detect this. AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS], -[gl_COMPILER_OPTION_IF([-Werror -Wunknown-warning-option], - [gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'], - [gl_unknown_warnings_are_errors=])]) +[AS_IF([test x${gl_unknown_warnings_are_errors+set} = x], + [gl_COMPILER_OPTION_IF([-Werror -Wunknown-warning-option], + [gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'], + [gl_unknown_warnings_are_errors=]) + ]) +]) # gl_WARN_ADD(OPTION, [VARIABLE = WARN_CFLAGS], # [PROGRAM = AC_LANG_PROGRAM()]) @@ -64,7 +68,7 @@ AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS], # # If VARIABLE is a variable name, AC_SUBST it. AC_DEFUN([gl_WARN_ADD], -[AC_REQUIRE([gl_UNKNOWN_WARNINGS_ARE_ERRORS]) +[gl_UNKNOWN_WARNINGS_ARE_ERRORS gl_COMPILER_OPTION_IF([$1], [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]), [" $1"])], [], |