diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-04 16:30:09 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-04 16:30:09 +0000 |
| commit | 5f5c0c92eab8028c29d6de2eb26ca7d20f6eb3e2 (patch) | |
| tree | 05a4c19cecd94a8201aaa41af04b7d9b7c5ebd4b | |
| parent | 58aefe4ef8d5d1194725f340e353de853b21bef6 (diff) | |
Require GLib 2.30 and forbid earlier-deprecated or newer functionstry-to-keep-up
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | salut/telepathy-salut-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | salut/telepathy-salut.pc.in | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 583e2bdf..2920db2a 100644 --- a/configure.ac +++ b/configure.ac @@ -161,9 +161,12 @@ AC_HEADER_RESOLV dnl GTK docs GTK_DOC_CHECK -dnl Check for Glib -PKG_CHECK_MODULES(GLIB, - [glib-2.0 >= 2.24, gobject-2.0 >= 2.16, gthread-2.0 >= 2.4, gio-2.0]) +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]) +PKG_CHECK_MODULES([GLIB], + [glib-2.0 >= 2.30, gobject-2.0, gthread-2.0, gio-2.0]) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) diff --git a/salut/telepathy-salut-uninstalled.pc.in b/salut/telepathy-salut-uninstalled.pc.in index 03fadcdb..2c660f4b 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.20 +Requires.private: glib-2.0 >= 2.30, gobject-2.0, gthread-2.0, gio-2.0, 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 a6d192ad..edb645a2 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.20 +Requires.private: glib-2.0 >= 2.30, gobject-2.0, gthread-2.0, gio-2.0, telepathy-glib >= 0.20 Libs: -L${pluginexeclibdir} -lsalut-plugins -lwocky Cflags: -I${includedir}/telepathy-salut-0 |