From: Colin Walters <walters@verbum.org>
Date: Thu, 20 Jul 2017 19:37:27 +0000 (-0400)
Subject: build: Turn off default warnings if we find -Werror specified
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~34^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8456fd5057cb3fbef3e27d53d979b8af33cbbbd4;p=ostree.git

build: Turn off default warnings if we find -Werror specified

Our CI runs use `-Werror`; there's no point to our default warning set kicking
in, it just bloats the command line output.

Closes: #1023
Approved by: jlebon
---

diff --git a/configure.ac b/configure.ac
index 3fc0fabf..9728dee3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,7 @@ AC_SUBST([YEAR_VERSION], [year_version])
 AC_SUBST([RELEASE_VERSION], [release_version])
 AC_SUBST([PACKAGE_VERSION], [package_version])
 
+AS_IF([echo "$CFLAGS" | grep -q -E -e '-Werror($| )'], [], [
 CC_CHECK_FLAGS_APPEND([WARN_CFLAGS], [CFLAGS], [\
         -pipe \
         -Wall \
@@ -46,7 +47,7 @@ CC_CHECK_FLAGS_APPEND([WARN_CFLAGS], [CFLAGS], [\
         -Werror=misleading-indentation \
 	-Werror=missing-include-dirs -Werror=aggregate-return \
   -Werror=unused-result \
-])
+])])
 AC_SUBST(WARN_CFLAGS)
 
 AC_MSG_CHECKING([for -fsanitize=address in CFLAGS])