diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-05-30 14:02:19 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-11 11:12:49 +0100 |
| commit | 2a8a6a50be5241627108a23f1dd1ba8d12693f8b (patch) | |
| tree | 6477be9e7348df304b727ae918e4ad2d8244393a | |
| parent | bae4f7493376cccb2cd629e56b4e4cc0624720b6 (diff) | |
Officially depend on GLib 2.32
In practice we depend on it anyway, via telepathy-glib 0.19.9.
Also update the telepathy-glib dependency in the .pc files to match
configure.ac.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65290
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | gabble/telepathy-gabble-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | gabble/telepathy-gabble.pc.in | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 645524a9d..bbf27718e 100644 --- a/configure.ac +++ b/configure.ac @@ -224,11 +224,11 @@ AM_CONDITIONAL([ENABLE_GTK_DOC], [test "x$enable_gtk_doc" = xyes]) dnl Check for Glib PKG_CHECK_MODULES(GLIB, - [glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gthread-2.0 >= 2.30, gio-2.0]) -PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.30]) + [glib-2.0 >= 2.32, gobject-2.0, gthread-2.0, gio-2.0]) +PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.32]) 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]) +AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_32, [Prevent post 2.32 APIs]) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) diff --git a/gabble/telepathy-gabble-uninstalled.pc.in b/gabble/telepathy-gabble-uninstalled.pc.in index 4e1196f00..f5d027fa0 100644 --- a/gabble/telepathy-gabble-uninstalled.pc.in +++ b/gabble/telepathy-gabble-uninstalled.pc.in @@ -12,6 +12,6 @@ Name: Telepathy-Gabble Description: 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, gio-2.0, telepathy-glib >= 0.7.37 +Requires.private: glib-2.0 >= 2.32, gobject-2.0, gio-2.0, telepathy-glib >= 0.19.9 Libs: ${abs_top_builddir}/src/libgabble-plugins.la Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/lib/ext/wocky diff --git a/gabble/telepathy-gabble.pc.in b/gabble/telepathy-gabble.pc.in index 5e0a46b89..013ddbb55 100644 --- a/gabble/telepathy-gabble.pc.in +++ b/gabble/telepathy-gabble.pc.in @@ -11,6 +11,6 @@ Name: Telepathy-Gabble Description: 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, gio-2.0, telepathy-glib >= 0.7.37 +Requires.private: glib-2.0 >= 2.32, gobject-2.0, gio-2.0, telepathy-glib >= 0.19.9 Libs: -L${pluginexeclibdir} -lgabble-plugins -lwocky Cflags: -I${includedir}/telepathy-gabble-0 |