[rhythmbox/gobject-introspection: 9/10] set gir/typelib deps based on gtk major version

[Jonathan Matthew <jmatthew src gnome org>]

commit 3c692a0270e9b9d00442076ece2174c7f94b68ef
Author: Jonathan Matthew <jonathan d14n org>
Date:   Thu Jul 22 14:54:55 2010 +1000

    set gir/typelib deps based on gtk major version

 bindings/gi/Makefile.am |    4 ++--
 configure.ac            |    6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/bindings/gi/Makefile.am b/bindings/gi/Makefile.am
index 042442e..93ca860 100644
--- a/bindings/gi/Makefile.am
+++ b/bindings/gi/Makefile.am
@@ -113,13 +113,13 @@ rhythmdb_introspection_sources = \
 		rhythmdb/rb-refstring.c
 
 RhythmDB-0.13.gir: $(top_builddir)/shell/librhythmbox-core.la
-RhythmDB_0_13_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-2.0 Gst-0.10 libxml2-2.0
+RhythmDB_0_13_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-$(GTK_MAJ_VER) Gst-0.10 libxml2-2.0
 RhythmDB_0_13_gir_CFLAGS = $(RHYTHMBOX_CFLAGS_NOWARN) $(TOTEM_PLPARSER_CFLAGS) $(DBUS_CFLAGS) $(GUDEV_CFLAGS) -I../..
 RhythmDB_0_13_gir_LIBS = $(top_builddir)/shell/librhythmbox-core.la
 RhythmDB_0_13_gir_FILES = $(addprefix $(top_srcdir)/,$(rhythmdb_introspection_sources))
 
 RB-0.13.gir: $(top_builddir)/shell/librhythmbox-core.la RhythmDB-0.13.gir
-RB_0_13_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-2.0 Gst-0.10 libxml2-2.0 RhythmDB-0.13
+RB_0_13_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-$(GTK_MAJ_VER) Gst-0.10 libxml2-2.0 RhythmDB-0.13
 RB_0_13_gir_CFLAGS = $(RHYTHMBOX_CFLAGS_NOWARN) $(TOTEM_PLPARSER_CFLAGS) $(DBUS_CFLAGS) $(GUDEV_CFLAGS) -I../..
 RB_0_13_gir_LIBS = $(top_builddir)/shell/librhythmbox-core.la
 RB_0_13_gir_FILES = $(addprefix $(top_srcdir)/,$(rb_introspection_sources))
diff --git a/configure.ac b/configure.ac
index c2896bb..eb43466 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,8 @@ dnl XXXX hack to kill off all the libtool tags ...
 dnl it isn't like we are using C++ or Fortran.
 m4_define([_LT_AC_TAGCONFIG],[])
 
-GOBJECT_INTROSPECTION_REQUIRE([0.6.7])
+GOBJECT_INTROSPECTION_REQS=0.6.7
+GOBJECT_INTROSPECTION_REQUIRE([$GOBJECT_INTROSPECTION_REQS])
 
 IT_PROG_INTLTOOL([0.35.0])
 
@@ -92,7 +93,7 @@ else
 	BRASERO_MAX_REQS=2.31.4
 	WEBKIT_MIN_REQS=1.1.17
 fi
-
+AC_SUBST(GTK_MAJ_VER)
 
 
 
@@ -123,6 +124,7 @@ PKG_CHECK_MODULES(RB_CLIENT, glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS gio-un
 
 dnl  note: gio-unix-2.0 is here for libmediaplayerid
 PKG_CHECK_MODULES(RHYTHMBOX,				\
+		  gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQS \
 		  gtk+-$GTK_MAJ_VER >= $GTK_REQS			\
 		  gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQS	\
 		  glib-2.0 >= $GLIB_REQS		\