From 36581b216476e337425ca8737aa7059062a81d99 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Wed, 23 Feb 2011 16:19:48 +0000
Subject: Always build telepathy-yell and handle Call channels

Just keep empathy-call optional.

Conflicts:

	libempathy-gtk/empathy-call-utils.c
	libempathy/empathy-channel-factory.c
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 3d0437532..1c87649bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,6 +172,8 @@ PKG_CHECK_MODULES(EMPATHY,
    gcr-3 >= $GCR_REQUIRED
 ])
 
+PKG_CHECK_MODULES(YELL, [telepathy-yell])
+
 PKG_CHECK_MODULES(EMPATHY_AV,
 [
    farsight2-0.10
@@ -185,13 +187,11 @@ AC_ARG_WITH(call,
             AC_HELP_STRING([--with-call], [build with Call interface support]),,
             [with_call=yes])
 if test "x$with_call" = "xyes" ; then
-   PKG_CHECK_MODULES(YELL, [telepathy-yell])
    PKG_CHECK_MODULES(EMPATHY_CALL,
    [
       farsight2-0.10
       telepathy-farstream
    ])
-   AC_DEFINE(HAVE_CALL, 1, [Define if we have Call interface support])
 fi
 AM_CONDITIONAL(HAVE_CALL, test "x$with_call" = "xyes")
 
-- 
cgit v1.2.3