diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-09 20:02:13 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-09 20:02:13 +0800 |
| commit | 3e8ad073e4434f8dea27c29def12f1548d5d7b86 (patch) | |
| tree | bbd930ec5af7a29c9fe2ce694af5003bfd0a2734 /configure.ac | |
| parent | 085365f20953fae1fb95d0272677273e3840e98f (diff) | |
| parent | aa2c67bebc8dee3d6f53abf8267090d1b68cd098 (diff) | |
| download | gsoc2013-empathy-3e8ad073e4434f8dea27c29def12f1548d5d7b86.tar gsoc2013-empathy-3e8ad073e4434f8dea27c29def12f1548d5d7b86.tar.gz gsoc2013-empathy-3e8ad073e4434f8dea27c29def12f1548d5d7b86.tar.bz2 gsoc2013-empathy-3e8ad073e4434f8dea27c29def12f1548d5d7b86.tar.lz gsoc2013-empathy-3e8ad073e4434f8dea27c29def12f1548d5d7b86.tar.xz gsoc2013-empathy-3e8ad073e4434f8dea27c29def12f1548d5d7b86.tar.zst gsoc2013-empathy-3e8ad073e4434f8dea27c29def12f1548d5d7b86.zip | |
Merge branch 'gnome-3-4'
Conflicts:
configure.ac
libempathy/empathy-tp-chat.c
src/empathy-event-manager.c
src/empathy-streamed-media-window.c
src/empathy-video-widget.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 1cce7ab16..3b04f6ed1 100644 --- a/configure.ac +++ b/configure.ac @@ -52,13 +52,16 @@ AC_DEFINE(CLUTTER_VERSION_MAX_ALLOWED, CLUTTER_VERSION_1_10, [Prevent post 1.10 CLUTTER_GTK_REQUIRED=0.90.3 CLUTTER_GST_REQUIRED=1.5.2 +TELEPATHY_GLIB_REQUIRED=0.18.0 +AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_18, [Ignore post 0.18 deprecations]) +AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_18, [Prevent post 0.18 APIs]) + GSTREAMER_REQUIRED=0.10.32 KEYRING_REQUIRED=2.26.0 GCR_REQUIRED=2.91.4 LIBCANBERRA_GTK_REQUIRED=0.25 LIBNOTIFY_REQUIRED=0.7.0 TELEPATHY_FARSTREAM_REQUIRED=0.2.1 -TELEPATHY_GLIB_REQUIRED=0.17.6 TELEPATHY_LOGGER=0.2.13 WEBKIT_REQUIRED=1.3.13 GOA_REQUIRED=3.5.1 |