From d026a29b38ca1a3388981c6e75a92602212373d8 Mon Sep 17 00:00:00 2001
From: Rob Taylor <rob.taylor@codethink.co.uk>
Date: Mon, 12 Jul 2010 20:41:44 +0200
Subject: [PATCH] Build typelib for gobject-introspection

---
 .gitignore      |  1 +
 autogen.sh      |  2 +-
 configure.ac    |  2 ++
 gee/Makefile.am | 14 ++++++++++++--
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index eae47ea..e274fdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ Makefile
 *.h
 *.stamp
 *.gir
+*.typelib
 .deps
 .libs
 config.*
diff --git a/autogen.sh b/autogen.sh
index ba9dc30..6c62fd1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,7 +9,7 @@ cd $srcdir
 # Automake requires that ChangeLog exists.
 touch ChangeLog
 
-gnome-autogen.sh || exit 1
+REQUIRED_M4MACROS=introspection.m4 gnome-autogen.sh || exit 1
 cd $ORIGDIR || exit $?
 
 if test -z "$NOCONFIGURE"; then
diff --git a/configure.ac b/configure.ac
index e622d72..ead59fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,8 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
+GOBJECT_INTROSPECTION_CHECK([0.9.0])
+
 AC_CONFIG_FILES([Makefile
            gee-1.0.pc
            benchmark/Makefile
diff --git a/gee/Makefile.am b/gee/Makefile.am
index 6da6e0e..5757425 100644
--- a/gee/Makefile.am
+++ b/gee/Makefile.am
@@ -92,10 +92,20 @@ dist_vapi_DATA = \
 	gee-1.0.vapi \
 	$(NULL)
 
-girdir = $(datadir)/gir-1.0
+if HAVE_INTROSPECTION
+girdir = @INTROSPECTION_GIRDIR@
 
-dist_gir_DATA = \
+gir_DATA = \
 	Gee-1.0.gir \
 	$(NULL)
 
+typelibdir = @INTROSPECTION_TYPELIBDIR@
+typelib_DATA = \
+	Gee-1.0.typelib \
+	$(NULL)
+
+Gee-1.0.typelib: Gee-1.0.gir
+	@INTROSPECTION_COMPILER@ --shared-library=libgee -o $@ $^
+endif
+
 EXTRA_DIST += $(libgee_la_VALASOURCES) gee-1.0.vapi Gee-1.0.gir gee.vala.stamp
-- 
2.7.4