[rhythmbox/gobject-introspection: 29/34] require gi, add uninstalled gi path if needed

[Jonathan Matthew <jmatthew src gnome org>]

commit 3c42e8c1da7d603252d9db7dd4ed01dcf455939f
Author: Jonathan Matthew <jonathan d14n org>
Date:   Wed Jul 14 12:18:44 2010 +1000

    require gi, add uninstalled gi path if needed

 bindings/Makefile.am |    7 +------
 configure.ac         |    2 +-
 shell/Makefile.am    |    3 ++-
 shell/main.c         |    6 ++++++
 4 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 7e1a372..db1641d 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -1,10 +1,5 @@
-SUBDIRS = 
-
-if HAVE_INTROSPECTION
-SUBDIRS += gi
+SUBDIRS = gi
 
 if ENABLE_VALA
 SUBDIRS += vala
 endif
-
-endif
diff --git a/configure.ac b/configure.ac
index 1615024..a7fd3aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ 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_CHECK([0.6.7])
+GOBJECT_INTROSPECTION_REQUIRE([0.6.7])
 
 IT_PROG_INTLTOOL([0.35.0])
 
diff --git a/shell/Makefile.am b/shell/Makefile.am
index e2c4016..192f2d9 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -162,7 +162,8 @@ rhythmbox_LDADD = 					\
 	librhythmbox-core.la				\
 	$(TOTEM_PLPARSER_LIBS)				\
 	$(RHYTHMBOX_LIBS)				\
-	$(DBUS_LIBS)
+	$(DBUS_LIBS)					\
+	$(INTROSPECTION_LIBS)
 
 rhythmbox_LDFLAGS = -export-dynamic -no-undefined
 
diff --git a/shell/main.c b/shell/main.c
index 595fc50..5c98d32 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -59,6 +59,8 @@
 #include <libgda/libgda.h>
 #endif
 
+#include <gobject-introspection-1.0/girepository.h>
+
 #include "rb-refstring.h"
 #include "rb-shell.h"
 #include "rb-shell-player.h"
@@ -178,6 +180,10 @@ main (int argc, char **argv)
 		rb_debug_init (debug);
 	rb_debug ("initializing Rhythmbox %s", VERSION);
 
+#if defined(USE_UNINSTALLED_DIRS)
+	g_irepository_prepend_search_path (SHARE_UNINSTALLED_BUILDDIR "/../bindings/gi");
+#endif
+
 	/* TODO: kill this function */
 	rb_threads_init ();
 	gdk_threads_enter ();