From 4a463c0a72b59dd5c3f3cbd496349dc17d2fb767 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 12 Apr 2012 16:41:23 +0100 Subject: [PATCH 2/2] Use --enable-fatal-warnings to select g-ir-scanner --warn-all --- configure.ac | 7 +++++++ telepathy-glib/introspection.am | 8 +------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index acddce5..a970e34 100644 --- a/configure.ac +++ b/configure.ac @@ -128,6 +128,13 @@ if test "x$enable_fatal_warnings" = xyes; then esac fi +if test "x$enable_fatal_warnings" = xyes; then + ERROR_SCANNERFLAGS=--warn-error +else + ERROR_SCANNERFLAGS= +fi +AC_SUBST([ERROR_SCANNERFLAGS]) + # Only use this where we really do want things to depend on whether it's # a release or not (like ABI-stability enforcement). For fatal warnings, # use ${enable_fatal_warnings} instead. diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am index 2c7bebc..101a905 100644 --- a/telepathy-glib/introspection.am +++ b/telepathy-glib/introspection.am @@ -76,12 +76,6 @@ TelepathyGLib_0_12_gir_FILES = \ _gen/telepathy-interfaces.h \ $(NULL) -if OFFICIAL_RELEASE -SCANNER_WARN_ERROR = -else -SCANNER_WARN_ERROR = --warn-error -endif - TelepathyGLib_0_12_gir_NAMESPACE = TelepathyGLib TelepathyGLib_0_12_gir_VERSION = 0.12 TelepathyGLib_0_12_gir_LIBS = libtelepathy-glib.la @@ -93,7 +87,7 @@ TelepathyGLib_0_12_gir_SCANNERFLAGS = \ -I$(top_srcdir) \ --c-include="telepathy-glib/telepathy-glib.h" \ --warn-all \ - $(SCANNER_WARN_ERROR) \ + $(ERROR_SCANNERFLAGS) \ $(NULL) TelepathyGLib_0_12_gir_INCLUDES = \ -- 1.7.10