about summary refs log tree commit diff
path: root/m4
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2020-05-19 16:38:36 +0200
committerSebastien Bacher <seb128@ubuntu.com>2020-05-19 17:09:07 +0200
commitccf6dc06bbee82c3d49f451545c5317337e0777e (patch)
treea8fddc8c6e2b3b99bebab1d5bb2a64581eff4bfd /m4
parentf109e55ef130ce84054d5ba3acf4b71cd8c7564a (diff)
parent7ffed1e6136de75188f10ba8763bcb942f932f8e (diff)
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'm4')
-rw-r--r--m4/compiler_options.m41
-rw-r--r--m4/introspection.m44
2 files changed, 3 insertions, 2 deletions
diff --git a/m4/compiler_options.m4 b/m4/compiler_options.m4
index 1483f3ed..9adc1f14 100644
--- a/m4/compiler_options.m4
+++ b/m4/compiler_options.m4
@@ -88,6 +88,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 		      -Wno-missing-field-initializers \
 		      -Wno-pragmas \
 		      -Wno-sign-compare \
+		      -Wno-tautological-constant-out-of-range-compare \
 		      -Wno-unknown-pragmas \
 		      -Wno-unused-parameter \
 		      ; do
diff --git a/m4/introspection.m4 b/m4/introspection.m4
index 44d19251..b3c2844e 100644
--- a/m4/introspection.m4
+++ b/m4/introspection.m4
@@ -30,7 +30,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
     INTROSPECTION_GIRDIR=
     INTROSPECTION_TYPELIBDIR=
 
-    if test "x$enable_introspection" == "xno"; then
+    if test "x$enable_introspection" = "xno"; then
       found_introspection="no"
     else
        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], [
@@ -52,7 +52,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
            AC_MSG_RESULT([$found_introspection])
        ], [found_introspection="no (not installed)"])
 
-       if test "x$enable_introspection" == "xyes"; then
+       if test "x$enable_introspection" = "xyes"; then
           if test "x$found_introspection" != "xyes"; then
               AC_MSG_ERROR([introspection enabled but can't be used])
           fi