summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabiano Fidêncio <fidencio@redhat.com>2016-02-22 22:10:01 +0100
committerFabiano Fidêncio <fidencio@redhat.com>2016-02-24 16:57:12 +0100
commit96d120903f0b95d49642e58d4f796b4f62aa8b20 (patch)
tree03d04bd7d98f5d5a52a01517737d15c13266341e
parentdf403f5aba01bcad98f946b17964e4f774695caf (diff)
downloadvirt-viewer-96d120903f0b95d49642e58d4f796b4f62aa8b20.tar.gz
virt-viewer-96d120903f0b95d49642e58d4f796b4f62aa8b20.tar.xz
virt-viewer-96d120903f0b95d49642e58d4f796b4f62aa8b20.zip
Use GLIB_VERSION_MAX_ALLOWED
In order to avoid using a too new GLib API. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> Acked-by: Pavel Grunt <pgrunt@redhat.com>
-rw-r--r--configure.ac10
1 files changed, 9 insertions, 1 deletions
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],