aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2011-11-14 18:23:57 +0800
committerXavier Claessens <xavier.claessens@collabora.co.uk>2012-01-10 21:26:59 +0800
commitaf4d97822b9055fd8a7670b53b28c7c1f820ec65 (patch)
treeea2618caaee98e447e20e87dedf72ccd3d2bcbbb /configure.ac
parent66e1966ee3b3303968997f229f62ada8d7b519ba (diff)
downloadgsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar
gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar.gz
gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar.bz2
gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar.lz
gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar.xz
gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar.zst
gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.zip
Remove tp-yell and use TpCallChannel
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac15
1 files changed, 2 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index f0b2eb907..efc7583b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,15 +71,6 @@ CHAMPLAIN_REQUIRED=0.12.1
# those warnings later during the cycle (bgo #662662)
AC_DEFINE(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, [Build with GLib deprecated])
-# telepathy-yell
-prev_top_build_prefix=$ac_top_build_prefix
-prev_ac_configure_args=$ac_configure_args
-ac_configure_args="$ac_configure_args --disable-shared-library"
-AX_CONFIG_DIR([telepathy-yell])
-ac_top_build_prefix=$prev_top_build_prefix
-ac_configure_args=$prev_ac_configure_args
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"telepathy-yell/telepathy-yell
-
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([configure.ac])
@@ -204,8 +195,6 @@ PKG_CHECK_MODULES(EMPATHY,
libsoup-2.4
])
-PKG_CHECK_MODULES(YELL, [telepathy-yell])
-
PKG_CHECK_MODULES(EMPATHY_AV,
[
farsight2-0.10
@@ -225,8 +214,8 @@ AC_ARG_ENABLE(call,
if test "x$enable_call" != "xno" ; then
PKG_CHECK_MODULES(EMPATHY_CALL,
[
- farsight2-0.10
- telepathy-farstream >= 0.1.2
+ farstream-0.1
+ telepathy-farstream >= 0.2.0
clutter-1.0 >= $CLUTTER_REQUIRED
clutter-gtk-1.0
clutter-gst-1.0