From 2f54f8f0ea5dd53dca495d44468beb3660e335b2 Mon Sep 17 00:00:00 2001
From: Damien Lespiau <damien.lespiau@gmail.com>
Date: Thu, 12 Aug 2010 10:36:04 -0400
Subject: [PATCH] introspection: Use the --quiet flag conditionally

--quiet has been added to g-ir-scanner in the 0.9.1 cycle. We really
want to be able to compile clutter with 0.6.14 to be able to reuse
gir files that are distributed in current distributions.

Use the INTROSPECTION_SCANNER_ARGS (previously unused) variable to
convey --quiet when necessary.

Fixes: http://bugzilla.clutter-project.org/show_bug.cgi?id=2265
---
 clutter/Makefile.am           | 2 --
 clutter/cogl/cogl/Makefile.am | 1 -
 clutter/json/Makefile.am      | 1 -
 configure.ac                  | 7 +++++++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index b68d574c3..ef1451fc5 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -343,7 +343,6 @@ if HAVE_INTROSPECTION
 Clutter-@CLUTTER_API_VERSION@.gir: Makefile $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_SONAME_INFIX@-@CLUTTER_API_VERSION@.la
 	$(QUIET_SCAN)$(INTROSPECTION_SCANNER) \
 		$(INTROSPECTION_SCANNER_ARGS) \
-		--quiet \
 		--namespace Clutter --nsversion=@CLUTTER_API_VERSION@ \
 		$(INCLUDES) \
 		$(AM_CPPFLAGS) \
@@ -394,7 +393,6 @@ BUILT_GIRSOURCES += Cogl-@CLUTTER_API_VERSION@.gir
 Cally-@CLUTTER_API_VERSION@.gir: Makefile $(INTROSPECTION_SCANNER) Clutter-@CLUTTER_API_VERSION@.gir
 	$(QUIET_SCAN)$(INTROSPECTION_SCANNER) \
 		$(INTROSPECTION_SCANNER_ARGS) \
-		--quiet \
 		--namespace Cally --nsversion=@CLUTTER_API_VERSION@ \
 		$(INCLUDES) \
 		$(AM_CPPFLAGS) \
diff --git a/clutter/cogl/cogl/Makefile.am b/clutter/cogl/cogl/Makefile.am
index 440b6ab7e..696f3a4f7 100644
--- a/clutter/cogl/cogl/Makefile.am
+++ b/clutter/cogl/cogl/Makefile.am
@@ -235,7 +235,6 @@ if HAVE_INTROSPECTION
 Cogl-@CLUTTER_API_VERSION@.gir: Makefile $(INTROSPECTION_SCANNER) libclutter-cogl.la
 	$(QUIET_SCAN)$(INTROSPECTION_SCANNER) \
 		$(INTROSPECTION_SCANNER_ARGS) \
-		--quiet \
 		--namespace Cogl --nsversion=@CLUTTER_API_VERSION@ \
 		$(INCLUDES) \
 		$(AM_CPPFLAGS) \
diff --git a/clutter/json/Makefile.am b/clutter/json/Makefile.am
index bac66446d..d3f254a89 100644
--- a/clutter/json/Makefile.am
+++ b/clutter/json/Makefile.am
@@ -44,7 +44,6 @@ BUILT_GIRSOURCES =
 ClutterJson-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-json.la
 	$(QUIET_SCAN)$(INTROSPECTION_SCANNER) \
 		$(INTROSPECTION_SCANNER_ARGS) \
-		--quiet \
 		--namespace ClutterJson --nsversion=@CLUTTER_API_VERSION@ \
 		$(INCLUDES) \
 		--add-include-path=$(srcdir) --add-include-path=. \
diff --git a/configure.ac b/configure.ac
index 0e7a92996..b352e75c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -983,6 +983,13 @@ dnl === GObject-Introspection check ===========================================
 
 GOBJECT_INTROSPECTION_CHECK([0.6.14])
 
+# --quiet has been added in in the 0.9.1 development cycle.
+PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 0.9.2],
+                 [
+                   INTROSPECTION_SCANNER_ARGS="$INTROSPECTION_SCANNER_ARGS --quiet"
+                   AC_SUBST(INTROSPECTION_SCANNER_ARGS)
+                 ])
+
 dnl === GTK Doc check =========================================================
 
 GTK_DOC_CHECK([1.13], [--flavour no-tmpl])