[hippo-canvas] Update introspection support

[Tomeu Vizoso <tomeuv src gnome org>]

commit 5ea143e45e0aa67c83b94c2574b690d4acdf4e24
Author: Tomeu Vizoso <tomeu sugarlabs org>
Date:   Tue May 5 15:24:50 2009 +0200

    Update introspection support
---
 Makefile-introspection.am |   20 ++++++++++----------
 configure.ac              |   18 ++++++++++++++++++
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/Makefile-introspection.am b/Makefile-introspection.am
index 662c6fb..c3f243d 100644
--- a/Makefile-introspection.am
+++ b/Makefile-introspection.am
@@ -1,21 +1,21 @@
-HippoCanvas.gir: $(libhippocanvas_1_la_SOURCES) $(nodist_libhippocanvas_1_la_SOURCES) libhippocanvas-1.la Makefile
-	libtool --mode=execute g-ir-scanner -v --namespace HippoCanvas \
-	    --strip-prefix=Hippo \
-            --include=Gtk.gir \
+Hippo-1.0.gir: $(libhippocanvas_1_la_SOURCES) $(nodist_libhippocanvas_1_la_SOURCES) libhippocanvas-1.la Makefile
+	libtool --mode=execute $(INTROSPECTION_SCANNER) -v --namespace Hippo --nsversion=1.0 \
+            --strip-prefix=Hippo \
+            --include=Gtk-2.0 \
             --library=hippocanvas-1 \
             --output $@ \
-            --pkg gtk+-2.0 \
-	    $(libhippocanvas_1_la_CPPFLAGS) \
-	    $(nodist_libhippocanvas_1_la_SOURCES) \
+            --pkg hippo-canvas-1 \
+            $(libhippocanvas_1_la_CPPFLAGS) \
+            $(nodist_libhippocanvas_1_la_SOURCES) \
             $(libhippocanvasinclude_HEADERS)
 
 girdir = $(datadir)/gir
-gir_DATA = HippoCanvas.gir
+gir_DATA = Hippo-1.0.gir
 CLEANFILES += $(gir_DATA)
 
 %.typelib: %.gir Makefile
-	$(DEBUG) g-ir-compiler $(G_IR_COMPILER_OPTS) $< -o $@
+	$(DEBUG) $(INTROSPECTION_COMPILER) $< -o $@
 
-typelibdir = $(datadir)/girepository
+typelibdir = $(INTROSPECTION_TYPELIBDIR)
 typelib_DATA = $(gir_DATA:.gir=.typelib)
 CLEANFILES += $(typelib_DATA)
diff --git a/configure.ac b/configure.ac
index 67b87e0..8bc02a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,6 +194,24 @@ PKG_CHECK_EXISTS(gobject-introspection-1.0, have_introspection=true, have_intros
 AC_MSG_RESULT($have_introspection)
 AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$have_introspection" = "xtrue")
 
+INTROSPECTION_SCANNER=
+INTROSPECTION_COMPILER=
+INTROSPECTION_GENERATE=
+INTROSPECTION_GIRDIR=
+INTROSPECTION_TYPELIBDIR=
+if test "x$have_introspection" = "xtrue"; then
+    INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+    INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+    INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+    INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+    INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+fi
+AC_SUBST(INTROSPECTION_SCANNER)
+AC_SUBST(INTROSPECTION_COMPILER)
+AC_SUBST(INTROSPECTION_GENERATE)
+AC_SUBST(INTROSPECTION_GIRDIR)
+AC_SUBST(INTROSPECTION_TYPELIBDIR)
+
 AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes")
 
 AC_OUTPUT([