diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-05-01 17:08:14 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-11 14:57:33 +0100 |
| commit | 231b12a7d127f07fc83b1c4486ddba9c65a16f66 (patch) | |
| tree | f3b96049ea3051b1a7e262126492f74317fa3615 | |
| parent | edb66cf55a57476f549c49830d0add36cb9e02cb (diff) | |
Require a vaguely modern telepathy-glib and GLib
We need telepathy-glib 0.20 for telepathy-glib-dbus.h; in Debian
I added a patch to fall back to the old headers, but on master
we shouldn't bother.
telepathy-glib 0.20 needs GLib 2.32, so we might as well require
that too.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=64121
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 6d3aff9..c534f2c 100644 --- a/configure.ac +++ b/configure.ac @@ -86,16 +86,16 @@ AC_HEADER_STDC([]) AC_C_INLINE AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_28, [Ignore post 2.28 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]) PKG_CHECK_MODULES([GLIB], - [glib-2.0 >= 2.30.0, gobject-2.0 >= 2.30.0, gio-2.0 >= 2.30.0 ]) + [glib-2.0 >= 2.32.0, gobject-2.0 >= 2.32.0, gio-2.0 >= 2.32.0 ]) PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.51, dbus-glib-1 >= 0.51]) AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_18, [Ignore post 0.18 deprecations]) AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_20, [Prevent post 0.20 APIs]) -PKG_CHECK_MODULES([TELEPATHY], [telepathy-glib >= 0.15.9]) +PKG_CHECK_MODULES([TELEPATHY], [telepathy-glib >= 0.20]) dnl Check for code generation tools XSLTPROC= |