diff options
| author | Johan Dahlin <johan@gnome.org> | 2009-12-16 20:28:55 -0200 |
|---|---|---|
| committer | Johan Dahlin <johan@gnome.org> | 2009-12-16 20:28:55 -0200 |
| commit | 1c457b2f60f399e09c35c7ffc973cb31760aba75 (patch) | |
| tree | 97d1b3aed591e7600bf31a8ced7af854eb235fff /m4 | |
| parent | 87c8df4f82f29668d4d7a77893f1f7b075ad3f91 (diff) | |
| download | atk-1c457b2f60f399e09c35c7ffc973cb31760aba75.tar.gz | |
Make sure distcheck passed with introspection
* Require 0.6.7 of gobject-introspection
* Update the m4 copy
* Port over to use Makefile.introspection
* Make sure gobject-introspection is installed when running
distcheck
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/introspection.m4 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/m4/introspection.m4 b/m4/introspection.m4 index 6e2c565..589721c 100644 --- a/m4/introspection.m4 +++ b/m4/introspection.m4 @@ -61,6 +61,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection fi AC_SUBST(INTROSPECTION_SCANNER) AC_SUBST(INTROSPECTION_COMPILER) @@ -69,6 +70,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], AC_SUBST(INTROSPECTION_TYPELIBDIR) AC_SUBST(INTROSPECTION_CFLAGS) AC_SUBST(INTROSPECTION_LIBS) + AC_SUBST(INTROSPECTION_MAKEFILE) AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") ]) |