Remove tp-yell and use TpCallChannel

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ca7db55c1018a62c4ce540750142940d898b39f7..efc7583b6a940776d209f2fb670eb3b64f0e8887 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl If not 1, append datestamp to the version number
-m4_define(empathy_released, 1)
+m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [3])
 m4_define([empathy_minor_version], [3])
@@ -57,6 +57,7 @@ GEOCLUE_REQUIRED=0.11
 ISO_CODES_REQUIRED=0.35
 NAUTILUS_SENDTO_REQUIRED=2.90.0
 NETWORK_MANAGER_REQUIRED=0.7.0
+CHAMPLAIN_REQUIRED=0.12.1
 
 # Use --enable-maintainer-mode to disable deprecated symbols,
 # disable single include and enable GSEAL. If this is not a released empathy,
@@ -70,15 +71,6 @@ NETWORK_MANAGER_REQUIRED=0.7.0
 # 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])
@@ -203,8 +195,6 @@ PKG_CHECK_MODULES(EMPATHY,
    libsoup-2.4
 ])
 
-PKG_CHECK_MODULES(YELL, [telepathy-yell])
-
 PKG_CHECK_MODULES(EMPATHY_AV,
 [
    farsight2-0.10
@@ -224,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
@@ -450,7 +440,7 @@ if test "x$enable_map" != "xno"; then
     [
        clutter-gtk-1.0
        champlain-gtk-0.12
-       champlain-0.12
+       champlain-0.12 >= $CHAMPLAIN_REQUIRED
     ], have_libchamplain="yes", have_libchamplain="no")
 
    if test "x$have_libchamplain" = "xyes"; then