From 23027f7611b53b594e4b4008e916e42b5154f6ac Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 22 Aug 2013 19:03:21 -0400
Subject: [PATCH] [introspection] Enable gobject-introspection again

---
 configure.ac    |  7 ++++---
 src/Makefile.am | 49 ++++++++++++++++++++++++++++---------------------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4fc1e6fa5..132d070a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ m4_define([hb_libtool_current],
 HB_LIBTOOL_VERSION_INFO=hb_libtool_current:hb_libtool_revision:hb_libtool_age
 AC_SUBST(HB_LIBTOOL_VERSION_INFO)
 
-dnl GOBJECT_INTROSPECTION_CHECK([0.9.0])
+GOBJECT_INTROSPECTION_CHECK([1.32.0])
 GTK_DOC_CHECK([1.15],[--flavour no-tmpl])
 
 # Functions and headers
@@ -409,6 +409,7 @@ Test / platform shapers (not normally needed):
 	Old HarfBuzz:		${have_hb_old}
 	Uniscribe:		${have_uniscribe}
 
-Documentation:
-	Referece docs:		${enable_gtk_doc}
+Other features:
+	Documentation:		${enable_gtk_doc}
+	Introspection:		${found_introspection}
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index 4fb271211..6109a6208 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -353,26 +353,33 @@ TESTS_ENVIRONMENT = \
 	HBHEADERS="$(HBHEADERS) $(HBNODISTHEADERS)" \
 	$(NULL)
 
-#-include $(INTROSPECTION_MAKEFILE)
-#INTROSPECTION_GIRS = hb-1.0.gir
-#INTROSPECTION_SCANNER_ARGS = -I$(srcdir) -n hb --identifier-prefix=hb_
-#INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-#
-#if HAVE_INTROSPECTION
-#
-#hb-1.0.gir: libharfbuzz.la
-#hb_1_0_gir_INCLUDES = GObject-2.0
-#hb_1_0_gir_CFLAGS = $(INCLUDES) $(HBCFLAGS) -DHB_H -DHB_H_IN -DHB_OT_H -DHB_OT_H_IN
-#hb_1_0_gir_LIBS = libharfbuzz.la
-#hb_1_0_gir_FILES = $(HBHEADERS) $(HBNODISTHEADERS)
-#
-#girdir = $(datadir)/gir-1.0
-#gir_DATA = $(INTROSPECTION_GIRS)
-#
-#typelibdir = $(libdir)/girepository-1.0
-#typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-#
-#CLEANFILES += $(gir_DATA) $(typelib_DATA)
-#endif
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS = harfbuzz-$(HB_VERSION_MAJOR).0.gir # What does the 0 mean anyway?!
+INTROSPECTION_SCANNER_ARGS = -I$(srcdir) -n hb --identifier-prefix=hb_ --warn-all
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+if HAVE_INTROSPECTION
+
+harfbuzz-0.0.gir: libharfbuzz.la
+harfbuzz_0_0_gir_INCLUDES = GObject-2.0
+harfbuzz_0_0_gir_CFLAGS = \
+	$(INCLUDES) \
+	$(HBCFLAGS) \
+	-DHB_H \
+	-DHB_H_IN \
+	-DHB_OT_H \
+	-DHB_OT_H_IN \
+	$(NULL)
+harfbuzz_0_0_gir_LIBS = libharfbuzz.la
+harfbuzz_0_0_gir_FILES = $(HBHEADERS) $(HBNODISTHEADERS)
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
+endif
 
 -include $(top_srcdir)/git.mk