From d49a19564bc1404c8536da85f97e22ae80e614e7 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Thu, 9 Jun 2011 16:50:34 +0100
Subject: Don't require telepathy-logger with --enable-call

Having it is required for displaying call events in the
history window though.
---
 configure.ac | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 434cadb7e..b192e5f6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,16 +214,33 @@ AM_CONDITIONAL(HAVE_CALL, test "x$have_farstream" = "xyes")
 # -----------------------------------------------------------
 # Call support in tp-logger
 # -----------------------------------------------------------
-SAVE_CFLAGS=$CFLAGS
-SAVE_CPPFLAGS=$CPPFLAGS
-CFLAGS="$CFLAGS $EMPATHY_CFLAGS"
-CPPFLAGS="$CPPFLAGS $EMPATHY_CFLAGS"
-
-AC_CHECK_HEADER(telepathy-logger/call-event.h,,
-  AC_MSG_ERROR([tp-logger must be compiled with --enable-call]))
+AC_ARG_WITH(call-logs,
+            AC_HELP_STRING([--enable-call-logs=@<:@no/yes/auto@:>@],
+            [build with call logs support]),,
+            [with_call_logs=auto])
+if test "x$with_call_logs" != "xno" ; then
+   SAVE_CFLAGS=$CFLAGS
+   SAVE_CPPFLAGS=$CPPFLAGS
+   CFLAGS="$CFLAGS $EMPATHY_CFLAGS"
+   CPPFLAGS="$CPPFLAGS $EMPATHY_CFLAGS"
+
+   AC_CHECK_HEADER(telepathy-logger/call-event.h,
+      have_call_logs="yes", have_call_logs="no")
+
+   CFLAGS=$SAVE_CFLAGS
+   CPPFLAGS=$SAVE_CPPFLAGS
+
+   if test "x$have_call_logs" = "xyes"; then
+      AC_DEFINE(HAVE_CALL_LOGS, 1, [Define if you have call log support])
+   fi
+else
+  have_call_logs=no
+fi
 
-CFLAGS=$SAVE_CFLAGS
-CPPFLAGS=$SAVE_CPPFLAGS
+if test "x$with_call_logs" = "xyes" -a "x$have_call_logs" != "xyes"; then
+   AC_MSG_ERROR([Call logs support requested but telepathy-logger wasn't
+                 built with --enable-call])
+fi
 
 # -----------------------------------------------------------
 # evolution-data-server (about-me)
@@ -607,7 +624,7 @@ Configure summary:
 	Spell checking (enchant)....:  ${have_enchant}
 	Display maps (libchamplain).:  ${have_libchamplain}
 	Location awareness (Geoclue):  ${have_geoclue}
-	Geocode support (Geoclue):     ${have_geocode}
+	Geocode support (Geoclue)...:  ${have_geocode}
 	Adium themes (Webkit).......:  ${have_webkit}
 	Meego widgets...............:  ${have_meego}
 	Control center embedding....:  ${have_control_center_embedding}
@@ -621,4 +638,5 @@ Configure summary:
 	Nautilus-sendto plugin......:  ${have_nst}
 	Salut E-D-S support.........:  ${with_eds}
 	Exp. Call channel handler...:  ${have_farstream}
+	Exp. Call log support.......:  ${have_call_logs}
 "
-- 
cgit v1.2.3