diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-04 15:57:22 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-04 15:57:22 +0000 |
| commit | c9779d896a77f96f8aa582113984ba722ff65eb0 (patch) | |
| tree | f4e6df904de2923c7dfe17b9e54a021ade616908 | |
| parent | f75008175d3aa5397204eb3d0b757cb49fcde30c (diff) | |
Require telepathy-glib 0.20, and forbid functions deprecated in that version
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | salut/telepathy-salut-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | salut/telepathy-salut.pc.in | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 56d7c4a5..8a10fc13 100644 --- a/configure.ac +++ b/configure.ac @@ -199,7 +199,9 @@ AC_SUBST(LIBXML2_CFLAGS) AC_SUBST(LIBXML2_LIBS) AC_DEFINE([TP_DISABLE_SINGLE_INCLUDE], [], [Disable single header include]) -PKG_CHECK_MODULES(TELEPATHY_GLIB, [telepathy-glib >= 0.19.7]) +AC_DEFINE([TP_VERSION_MIN_REQUIRED], [TP_VERSION_0_20], [Ignore post 0.20 deprecations]) +AC_DEFINE([TP_VERSION_MAX_ALLOWED], [TP_VERSION_0_20], [Prevent post 0.20 APIs]) +PKG_CHECK_MODULES([TELEPATHY_GLIB], [telepathy-glib >= 0.20]) AC_SUBST(TELEPATHY_GLIB_CFLAGS) AC_SUBST(TELEPATHY_GLIB_LIBS) diff --git a/salut/telepathy-salut-uninstalled.pc.in b/salut/telepathy-salut-uninstalled.pc.in index 050c0b86..03fadcdb 100644 --- a/salut/telepathy-salut-uninstalled.pc.in +++ b/salut/telepathy-salut-uninstalled.pc.in @@ -12,6 +12,6 @@ Name: Telepathy-Salut (uninstalled) Description: Link-local XMPP backend for the Telepathy framework (uninstalled) Version: @VERSION@ Requires: pkg-config >= 0.21 -Requires.private: glib-2.0 >= 2.16, gobject-2.0 >= 2.16, telepathy-glib >= 0.13.12 +Requires.private: glib-2.0 >= 2.16, gobject-2.0 >= 2.16, telepathy-glib >= 0.20 Libs: ${abs_top_builddir}/src/libsalut-plugins.la ${abs_top_builddir}/lib/ext/wocky/wocky/libwocky.la Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/lib/ext/wocky diff --git a/salut/telepathy-salut.pc.in b/salut/telepathy-salut.pc.in index d38a3dfb..a6d192ad 100644 --- a/salut/telepathy-salut.pc.in +++ b/salut/telepathy-salut.pc.in @@ -12,6 +12,6 @@ Name: Telepathy-Salut Description: Link-local XMPP backend for the Telepathy framework Version: @VERSION@ Requires: pkg-config >= 0.21 -Requires.private: glib-2.0 >= 2.16, gobject-2.0 >= 2.16, telepathy-glib >= 0.13.12 +Requires.private: glib-2.0 >= 2.16, gobject-2.0 >= 2.16, telepathy-glib >= 0.20 Libs: -L${pluginexeclibdir} -lsalut-plugins -lwocky Cflags: -I${includedir}/telepathy-salut-0 |