From 83478ae3a306d1e72b985e04a863af25f1b82c98 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 8 Feb 2011 18:40:08 -0500 Subject: [PATCH] Define the required introspection version in configure.ac --- INSTALL.in | 6 +++--- configure.ac | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/INSTALL.in b/INSTALL.in index d3c7f05c03..94d0394abf 100644 --- a/INSTALL.in +++ b/INSTALL.in @@ -9,7 +9,7 @@ GTK+ requires the following packages: GdkPixbuf @GDK_PIXBUF_REQUIRED_VERSION@, ATK @ATK_REQUIRED_VERSION@ and cairo @CAIRO_REQUIRED_VERSION@. - - gobject-introspection 0.9.3 or newer. + - gobject-introspection @INTROSPECTION_REQUIRED_VERSION@ or newer. Simple install procedure ======================== @@ -24,8 +24,8 @@ Simple install procedure The Details =========== -Complete information about installing GTK+ and related libraries can be found -in the file: +Complete information about installing GTK+ and related libraries +can be found in the file: docs/reference/gtk/html/gtk-building.html diff --git a/configure.ac b/configure.ac index 525816492c..2866c81247 100644 --- a/configure.ac +++ b/configure.ac @@ -43,17 +43,21 @@ m4_define([pango_required_version], [1.20]) m4_define([atk_required_version], [1.29.2]) m4_define([cairo_required_version], [1.10.0]) m4_define([gdk_pixbuf_required_version], [2.21.0]) +m4_define([introspection_required_version], [0.10.1]) + GLIB_REQUIRED_VERSION=glib_required_version PANGO_REQUIRED_VERSION=pango_required_version ATK_REQUIRED_VERSION=atk_required_version CAIRO_REQUIRED_VERSION=cairo_required_version GDK_PIXBUF_REQUIRED_VERSION=gdk_pixbuf_required_version +INTROSPECTION_REQUIRED_VERSION=introspection_required_version + AC_SUBST(GLIB_REQUIRED_VERSION) AC_SUBST(PANGO_REQUIRED_VERSION) AC_SUBST(ATK_REQUIRED_VERSION) AC_SUBST(CAIRO_REQUIRED_VERSION) AC_SUBST(GDK_PIXBUF_REQUIRED_VERSION) - +AC_SUBST(INTROSPECTION_REQUIRED_VERSION) # Save this value here, since automake will set cflags later cflags_set=${CFLAGS+set} @@ -1491,7 +1495,7 @@ GLIB_GSETTINGS # GObject introspection ################################################## -GOBJECT_INTROSPECTION_CHECK([0.10.1]) +GOBJECT_INTROSPECTION_CHECK(introspection_required_version) ################################################## # Packagekit module