diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2012-04-03 15:04:53 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2012-04-03 15:04:53 +0800 |
| commit | 4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8 (patch) | |
| tree | 1d486bb255557fbd2b445eb3eb1d73cb391de2ee /configure.ac | |
| parent | f11ad07acca7b180723aa70c8ffa00aba5b361c1 (diff) | |
| parent | be2a0aa278149a082511bb3f4814f5850c970ce4 (diff) | |
| download | gsoc2013-empathy-4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8.tar gsoc2013-empathy-4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8.tar.gz gsoc2013-empathy-4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8.tar.bz2 gsoc2013-empathy-4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8.tar.lz gsoc2013-empathy-4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8.tar.xz gsoc2013-empathy-4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8.tar.zst gsoc2013-empathy-4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8.zip | |
Merge branch 'gnome-3-4'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/configure.ac b/configure.ac index 4300cab06..33738e604 100644 --- a/configure.ac +++ b/configure.ac @@ -59,7 +59,7 @@ LIBCANBERRA_GTK_REQUIRED=0.25 LIBNOTIFY_REQUIRED=0.7.0 TELEPATHY_FARSTREAM_REQUIRED=0.2.1 TELEPATHY_GLIB_REQUIRED=0.17.5 -TELEPATHY_LOGGER=0.2.10 +TELEPATHY_LOGGER=0.2.13 WEBKIT_REQUIRED=1.3.13 GOA_REQUIRED=3.3.0 @@ -232,40 +232,6 @@ fi AM_CONDITIONAL(HAVE_EMPATHY_AV, test "x$have_empathy_av" = "xyes") # ----------------------------------------------------------- -# Call support in tp-logger -# ----------------------------------------------------------- -AC_ARG_ENABLE(call-logs, - AS_HELP_STRING([--enable-call-logs=@<:@no/yes/auto@:>@], - [build with call logs support]),, - [enable_call_logs=auto]) -if test "x$enable_call_logs" != "xno" ; then - SAVE_CFLAGS=$CFLAGS - SAVE_CPPFLAGS=$CPPFLAGS - SAVE_LDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS $EMPATHY_CFLAGS" - CPPFLAGS="$CPPFLAGS $EMPATHY_CFLAGS" - LDFLAGS="$LDFLAGS $EMPATHY_LDFLAGS" - - AC_CHECK_HEADER(telepathy-logger/call-event.h, - have_call_logs="yes", have_call_logs="no") - - CFLAGS=$SAVE_CFLAGS - CPPFLAGS=$SAVE_CPPFLAGS - LDFLAGS=$SAVE_LDFLAGS - - 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 - -if test "x$enable_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) # ----------------------------------------------------------- AC_ARG_WITH(eds, @@ -686,6 +652,5 @@ Configure summary: Nautilus-sendto plugin......: ${have_nst} GOA MC plugin...............: ${have_goa} Salut E-D-S support.........: ${with_eds} - Exp. Call log support.......: ${have_call_logs} empathy-av (legacy).........: ${enable_empathy_av} " |