From ba2e1f41475316609974d2dad157848b3aaead3d Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 12 Sep 2013 15:06:40 +0200 Subject: [PATCH 1/3] bump TP_VERSION to 0.22 We build just fine with it. https://bugs.freedesktop.org/show_bug.cgi?id=69272 --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5b08b67..bb7cbfb 100644 --- a/configure.ac +++ b/configure.ac @@ -73,10 +73,13 @@ AC_ARG_ENABLE(leaky-request-stubs, AC_SUBST(ENABLE_LEAKY_REQUEST_STUBS) PKG_CHECK_MODULES(PURPLE,[purple >= 2.7]) -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]) +AC_DEFINE([TP_VERSION_MIN_REQUIRED], [TP_VERSION_0_22], [Ignore post 0.22 deprecations]) +AC_DEFINE([TP_VERSION_MAX_ALLOWED], [TP_VERSION_0_22], [Prevent post 0.22 APIs]) +PKG_CHECK_MODULES(TP_GLIB,[telepathy-glib >= 0.21]) + 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]) -- 1.8.3.1