[rhythmbox/gstreamer-1.0: 16/39] bindings/gi: make gir scanner find GStreamer .gir files in right prefix

[Jonathan Matthew <jmatthew src gnome org>]

commit d09e0041d55a07ea5857e39ae4942a3748a87556
Author: Tim-Philipp MÃller <tim centricular net>
Date:   Wed Aug 8 21:33:13 2012 +0100

    bindings/gi: make gir scanner find GStreamer .gir files in right prefix
    
    Fixes build in uninstalled GStreamer setup or with GStreamer having
    been installed in a different prefix.

 bindings/gi/Makefile.am |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/bindings/gi/Makefile.am b/bindings/gi/Makefile.am
index 851a3f0..beddf36 100644
--- a/bindings/gi/Makefile.am
+++ b/bindings/gi/Makefile.am
@@ -1,8 +1,19 @@
-
+# These find the gir and typelib files in an uninstalled GStreamer setup
+# or if GStreamer is installed in a different prefix than most other things
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_srcdir) --add-include-path=$(top_builddir)/bindings/gi --c-include=rhythmbox.h --warn-all
-INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)
+INTROSPECTION_SCANNER_ARGS = \
+		--add-include-path=$(top_srcdir) \
+		--add-include-path=$(top_builddir)/bindings/gi \
+		--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-1.0` \
+		--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-1.0` \
+		--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-1.0` \
+		--c-include=rhythmbox.h --warn-all
+INTROSPECTION_COMPILER_ARGS = \
+		--includedir=$(top_srcdir) \
+		--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-1.0` \
+		--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-1.0` \
+		--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-1.0`
 
 mpid_introspection_sources = \
 		lib/libmediaplayerid/mediaplayerid.h \