From 96d120903f0b95d49642e58d4f796b4f62aa8b20 Mon Sep 17 00:00:00 2001 From: Fabiano Fidêncio Date: Mon, 22 Feb 2016 22:10:01 +0100 Subject: Use GLIB_VERSION_MAX_ALLOWED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In order to avoid using a too new GLib API. Signed-off-by: Fabiano Fidêncio Acked-by: Pavel Grunt --- configure.ac | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5503d46..437f6e4 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,10 @@ AC_CANONICAL_HOST m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) AM_SILENT_RULES([yes]) -GLIB2_REQUIRED="2.38.0" +# Keep these two definitions in agreement. +GLIB2_REQUIRED="2.38" +GLIB2_ENCODED_VERSION="GLIB_VERSION_2_38" + LIBXML2_REQUIRED="2.6.0" LIBVIRT_REQUIRED="0.10.0" GTK_REQUIRED="3.10" @@ -94,6 +97,11 @@ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` AC_SUBST(GLIB_MKENUMS) PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQUIRED gio-2.0 gthread-2.0 gmodule-export-2.0) +GLIB2_CFLAGS="$GLIB2_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB2_ENCODED_VERSION" +GLIB2_CFLAGS="$GLIB2_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=$GLIB2_ENCODED_VERSION" +AC_SUBST(GLIB2_CFLAGS) +AC_SUBST(GLIB2_LIBS) + PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_REQUIRED) AC_ARG_WITH([libvirt], -- cgit