From d9c99a29a0d3384c9c3d2adce430f5cb1134ab6a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 30 Mar 2016 00:56:30 +0200 Subject: Imported Upstream version 1.1.92 --- m4/compiler_warnings.m4 | 1 + m4/introspection.m4 | 2 ++ 2 files changed, 3 insertions(+) (limited to 'm4') diff --git a/m4/compiler_warnings.m4 b/m4/compiler_warnings.m4 index a7d6669d..77dcc7a5 100644 --- a/m4/compiler_warnings.m4 +++ b/m4/compiler_warnings.m4 @@ -50,6 +50,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \ -Wdeclaration-after-statement -Wformat-security \ -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \ + -Wno-duplicate-decl-specifier \ -Wstrict-prototypes \ -fno-strict-aliasing -Wno-unused-but-set-variable \ -Wundef -Wimplicit-function-declaration \ diff --git a/m4/introspection.m4 b/m4/introspection.m4 index efe0e9ac..1dc1556d 100644 --- a/m4/introspection.m4 +++ b/m4/introspection.m4 @@ -41,6 +41,8 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], ],dnl [auto],[dnl PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + dnl Canonicalize enable_introspection + enable_introspection=$found_introspection ],dnl [dnl AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) -- cgit 1.3.0-6-gf8a5