From fd15a3a04c69af0f5c04cde8c659269d0b139c28 Mon Sep 17 00:00:00 2001
From: Johan Dahlin <johan@gnome.org>
Date: Fri, 18 Dec 2009 09:14:50 -0200
Subject: [PATCH] Use introspection.m4

Use introspection.m4 without requiring it to be included in the tree.

https://bugzilla.gnome.org/show_bug.cgi?id=604770
---
 autogen.sh   |  1 +
 configure.in | 23 ++---------------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 2482946..e50757f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,6 +7,7 @@ test -z "$srcdir" && srcdir=.
 REQUIRED_AUTOMAKE_VERSION=1.9
 
 PKG_NAME="pango"
+REQUIRED_M4MACROS=introspection.m4
 
 (test -f $srcdir/configure.in \
   && test -f $srcdir/README \
diff --git a/configure.in b/configure.in
index 751a320..6848d59 100644
--- a/configure.in
+++ b/configure.in
@@ -483,27 +483,8 @@ PKG_CHECK_MODULES(LIBTHAI, libthai >= $LIBTHAI_REQUIRED_VERSION, have_libthai=tr
 #
 # Checks for GObject Introspection
 #
-have_introspection=false
-PKG_CHECK_MODULES(INTROSPECTION, gobject-introspection-1.0 >= 0.6.4, have_introspection=true, have_introspection=false)
-AM_CONDITIONAL(HAVE_INTROSPECTION, $have_introspection)
-
-G_IR_SCANNER=
-G_IR_COMPILER=
-G_IR_GENERATE=
-GIRDIR=
-TYPELIBDIR=
-if $have_introspection; then
-   G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-   G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-   G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-   GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-   TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-fi
-AC_SUBST(G_IR_SCANNER)
-AC_SUBST(G_IR_COMPILER)
-AC_SUBST(G_IR_GENERATE)
-AC_SUBST(GIRDIR)
-AC_SUBST(TYPELIBDIR)
+
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
 #
 # Modules to build
-- 
2.7.4