summaryrefslogtreecommitdiff
path: root/m4/ax_compiler_flags_gir.m4
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2015-02-20 18:34:34 +0000
committerPhilip Withnall <philip.withnall@collabora.co.uk>2015-02-23 09:36:51 +0000
commit6f2a9bf0ce1e095195b053e0d9a8bd79ebac4de7 (patch)
tree311ffd162f5185246fc4e3b21c4c4332a761d64d /m4/ax_compiler_flags_gir.m4
parent407ddbbc953737a6e3f603982a7362dddb2889c9 (diff)
downloadautoconf-archive-6f2a9bf0ce1e095195b053e0d9a8bd79ebac4de7.tar.gz
ax_compiler_flags: Eliminate ‘minimum’ and ‘maximum’ warning levels
These went against the whole concept of providing a baseline set of warnings which is set by the module maintainer, since it allowed individual developers to opt out of certain classes of warning. Remove them, leaving the ‘no’, ‘yes’ and ‘error’ levels. This maintains API compatibility of the macros by marking various EXTRA-* variables as unused, but still handling them, and merging their values with the preceding EXTRA-* variables. For example, all extra ‘maximum’ and ‘error’ flags are now included in the ‘yes’ level of warnings.
Diffstat (limited to 'm4/ax_compiler_flags_gir.m4')
-rw-r--r--m4/ax_compiler_flags_gir.m420
1 files changed, 6 insertions, 14 deletions
diff --git a/m4/ax_compiler_flags_gir.m4 b/m4/ax_compiler_flags_gir.m4
index 99a27c1..180f50d 100644
--- a/m4/ax_compiler_flags_gir.m4
+++ b/m4/ax_compiler_flags_gir.m4
@@ -4,7 +4,7 @@
#
# SYNOPSIS
#
-# AX_COMPILER_FLAGS_GIR([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-MINIMUM-FLAGS], [EXTRA-YES-FLAGS], [EXTRA-MAXIMUM-FLAGS], [EXTRA-ERROR-FLAGS])
+# AX_COMPILER_FLAGS_GIR([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS])
#
# DESCRIPTION
#
@@ -26,7 +26,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 3
+#serial 4
AC_DEFUN([AX_COMPILER_FLAGS_GIR],[
AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
@@ -39,27 +39,19 @@ AC_DEFUN([AX_COMPILER_FLAGS_GIR],[
AX_APPEND_FLAG([$3],ax_warn_scannerflags_variable)
AS_IF([test "$ax_enable_compile_warnings" != "no"],[
- # "minimum" flags
+ # "yes" flags
AX_APPEND_FLAG([ dnl
--warn-all dnl
$4 dnl
+ $5 dnl
+ $6 dnl
+ $7 dnl
],ax_warn_scannerflags_variable)
])
- AS_IF([test "$ax_enable_compile_warnings" != "no" -a \
- "$ax_enable_compile_warnings" != "minimum"],[
- # "yes" flags
- AX_APPEND_FLAG([$5],ax_warn_scannerflags_variable)
- ])
- AS_IF([test "$ax_enable_compile_warnings" = "maximum" -o \
- "$ax_enable_compile_warnings" = "error"],[
- # "maximum" flags
- AX_APPEND_FLAG([$6],ax_warn_scannerflags_variable)
- ])
AS_IF([test "$ax_enable_compile_warnings" = "error"],[
# "error" flags
AX_APPEND_FLAG([ dnl
--warn-error dnl
- $7 dnl
],ax_warn_scannerflags_variable)
])