diff options
author | Fabiano FidĂȘncio <fidencio@redhat.com> | 2016-01-07 18:11:47 +0100 |
---|---|---|
committer | Fabiano FidĂȘncio <fidencio@redhat.com> | 2016-01-11 14:44:46 +0100 |
commit | 447efb591ff36fd9174b1e2223bae5b7e8cba453 (patch) | |
tree | deb44b1a21c1f364aead693e6b5837eafe4b5558 /configure.ac | |
parent | 72a9345d7a2b45b64f131d92bb3fa6f02d8b53d4 (diff) | |
download | libosinfo-447efb591ff36fd9174b1e2223bae5b7e8cba453.tar.gz |
Use GLIB_VERSION_MAX_ALLOWED
In order to avoid using a too new GLib API.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 5c38b96..33102f0 100644 --- a/configure.ac +++ b/configure.ac @@ -36,12 +36,20 @@ m4_if(m4_version_compare([2.61a.100], # Use the silent-rules feature when possible. m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) -PKG_CHECK_MODULES([GOBJECT], [gobject-2.0]) -PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.36]) +# Keep these two definitions in agreement. +GLIB_MINIMUM_VERSION="2.36" +GLIB_ENCODED_VERSION="GLIB_VERSION_2_36" + PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.42]) PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= 2.6.0]) PKG_CHECK_MODULES([LIBXSLT], [libxslt >= 1.0.0]) +PKG_CHECK_MODULES([GLIB], [glib-2.0 >= $GLIB_MINIMUM_VERSION gobject-2.0 gio-2.0]) +GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB_ENCODED_VERSION" +GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=$GLIB_ENCODED_VERSION" +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) + GTK_DOC_CHECK([1.10],[--flavour no-tmpl]) AC_ARG_ENABLE([tests], |