summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.co.uk>2013-05-27 13:17:16 +0200
committerXavier Claessens <xavier.claessens@collabora.co.uk>2013-05-27 13:41:20 +0200
commit69f00e7be3a9a4984570d1e7fe4eafb4ba61f077 (patch)
tree3810b7e42ec438a9a88e7d1fe8994ab029ba79a9 /configure.ac
parent7af2f4947add8a20ba81f96213594b0012492327 (diff)
downloadtelepathy-haze-69f00e7be3a9a4984570d1e7fe4eafb4ba61f077.tar.gz
Work around GValueArray deprecation
We define GLIB_VERSION_MIN_REQUIRED to GLIB_VERSION_2_30 to ignore post 2.30 deprecations. Note that this does not bump required glib version, it is still 2.22. With glib < 2.32 it won't have any effect.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 1c973af..d0709f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,10 @@ PKG_CHECK_MODULES(TP_GLIB,[telepathy-glib >= 0.15.1])
PKG_CHECK_MODULES(GLIB,[glib-2.0 >= 2.22, gobject-2.0, gio-2.0])
PKG_CHECK_MODULES(DBUS_GLIB,[dbus-glib-1 >= 0.73])
+dnl MIN_REQUIRED must stay to 2.30 because of GValueArray
+AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_30], [Ignore post 2.30 deprecations])
+AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_30], [Prevent post 2.30 APIs])
+
GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
AC_SUBST(GLIB_GENMARSHAL)