[empathy: 48/99] auto-detect the presence of farsight
- From: Emilio Pozuelo Monfort <epm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 48/99] auto-detect the presence of farsight
- Date: Thu, 9 Jun 2011 09:53:23 +0000 (UTC)
commit b51267374d508af1f8554476af0c771f330ff813
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date: Wed Feb 23 18:29:30 2011 +0000
auto-detect the presence of farsight
configure.ac | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1c87649..fd84e20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,14 +186,24 @@ PKG_CHECK_MODULES(EMPATHY_AV,
AC_ARG_WITH(call,
AC_HELP_STRING([--with-call], [build with Call interface support]),,
[with_call=yes])
-if test "x$with_call" = "xyes" ; then
+if test "x$with_call" != "xno" ; then
PKG_CHECK_MODULES(EMPATHY_CALL,
[
farsight2-0.10
telepathy-farstream
- ])
+ ], have_farstream="yes", have_farstream="no" )
+
+ if test "x$have_farstream" = "xyes"; then
+ AC_DEFINE(HAVE_CALL, 1, [Define if you have Call channel support])
+ fi
+else
+ have_farstream=no
+fi
+
+if test "x$with_call" = "xyes" -a "x$have_farstream" != "xyes"; then
+ AC_MSG_ERROR([Could not find Call handler dependencies.])
fi
-AM_CONDITIONAL(HAVE_CALL, test "x$with_call" = "xyes")
+AM_CONDITIONAL(HAVE_CALL, test "x$have_farstream" = "xyes")
# -----------------------------------------------------------
# evolution-data-server (about-me)
@@ -560,4 +570,5 @@ Configure summary:
Extras:
Nautilus-sendto plugin......: ${have_nst}
Salut E-D-S support.........: ${with_eds}
+ Exp. Call channel handler...: ${have_farstream}
"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]