diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-25 19:48:33 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-10-04 13:06:07 +0100 |
| commit | 6f7aad7fc5794fb3ff1a694b367f9bc415b15cca (patch) | |
| tree | 1c354c617b5219d57ad2f493337e3545f351f7f3 | |
| parent | 17832d9bb6e248bccbf7b6f96fdd1e17262b7a89 (diff) | |
require telepathy-glib-1
Drop TP_DISABLE_SINGLE_INCLUDE: it no longer does anything (the
equivalent functionality is on by default).
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54879
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index c5b945cb..d6ceca62 100644 --- a/configure.ac +++ b/configure.ac @@ -224,13 +224,13 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.95, dbus-glib-1 >= 0.82]) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) -PKG_CHECK_MODULES([TELEPATHY], [telepathy-glib >= 0.21.1]) -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([TELEPATHY], + [telepathy-glib-1 >= 0.99.1, telepathy-glib-1-dbus >= 0.99.1]) +AC_DEFINE([TP_VERSION_MIN_REQUIRED], [TP_VERSION_1_0], + [Ignore post-1.0 deprecations]) +AC_DEFINE([TP_VERSION_MAX_ALLOWED], [TP_VERSION_1_0], + [Prevent post-1.0 APIs]) AC_DEFINE([TP_SEAL_ENABLE], [], [Define to hide deprecated struct fields]) -AC_DEFINE([TP_DISABLE_SINGLE_INCLUDE], [], [Avoid individual headers]) PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.32, gobject-2.0, gmodule-no-export-2.0, gio-2.0]) |