[at-spi2-core/wip/meson: 13/15] build: Use modern introspection

[Emmanuele Bassi <ebassi src gnome org>]

commit 9d75b1df59aeace18dd62f898abd85cf2b5c22da
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed May 24 14:03:10 2017 +0100

    build: Use modern introspection
    
    Do not copy an older version of the introspection.m4 macro, and depend
    on a recent version of gobject-introspection.

 atspi/Makefile.am   |    4 +-
 configure.ac        |   12 ++++--
 m4/introspection.m4 |   94 ---------------------------------------------------
 3 files changed, 10 insertions(+), 100 deletions(-)
---
diff --git a/atspi/Makefile.am b/atspi/Makefile.am
index 07f0786..f6c45fa 100644
--- a/atspi/Makefile.am
+++ b/atspi/Makefile.am
@@ -111,12 +111,12 @@ ENUM_TYPES = \
        atspi-constants.h \
        atspi-types.h
 
-atspi-enum-types.h: atspi-enum-types.h.template $(ENUM_TYPES) $(GLIB_MKENUMS)
+atspi-enum-types.h: atspi-enum-types.h.template $(ENUM_TYPES)
        $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/atspi-enum-types.h.template $(addprefix $(srcdir)/, 
$(ENUM_TYPES)) > $@.tmp \
        && (cmp -s $@.tmp $@ || cp -f $@.tmp $@) \
        && rm -f $@.tmp
 
-atspi-enum-types.c: atspi-enum-types.c.template $(ENUM_TYPES) $(GLIB_MKENUMS)
+atspi-enum-types.c: atspi-enum-types.c.template $(ENUM_TYPES)
        $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/atspi-enum-types.c.template $(addprefix $(srcdir)/, 
$(ENUM_TYPES)) > $@.tmp \
        && (cmp -s $@.tmp $@ || cp -f $@.tmp $@) \
        && rm -f $@.tmp
diff --git a/configure.ac b/configure.ac
index c8ed740..f77cec7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,10 @@ PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.36.0])
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
 
+# Use pkg-config to find the glib-mkenums script
+GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+AC_SUBST(GLIB_MKENUMS)
+
 PKG_CHECK_MODULES(GOBJ, [gobject-2.0 >= 2.0.0])
 AC_SUBST(GOBJ_LIBS)
 AC_SUBST(GOBJ_CFLAGS)
@@ -142,9 +146,7 @@ else
 fi
 AC_SUBST(DBUS_SERVICES_DIR)
 
-AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
-
-GOBJECT_INTROSPECTION_CHECK([0.9.6])
+GOBJECT_INTROSPECTION_CHECK([1.32.0])
 
 AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
 
@@ -162,12 +164,14 @@ typedef void *dbind_pointer;])
 AC_CHECK_ALIGNOF(dbind_struct, [AC_INCLUDES_DEFAULT
 typedef struct {char s1;} dbind_struct;])
 
-GTK_DOC_CHECK([1.09])
+GTK_DOC_CHECK([1.25])
 
 if test "x$GCC" = xyes; then
        CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
 fi
+
 CPPFLAGS=$orig_CPPFLAGS 
+
 AC_CONFIG_FILES([
         Makefile
         po/Makefile.in