diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-06-20 03:29:51 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-06-20 03:29:51 +0800 |
| commit | 96a20bbc3f491b9f6bfa00401beb4cf24b7a200c (patch) | |
| tree | 2fd2e9018aae3ba6285cdc5b8a32f3b1fdd19e12 /configure.ac | |
| parent | fb06bf8e12d112645433eb7ed2bd9ffb82980278 (diff) | |
| download | gsoc2013-empathy-96a20bbc3f491b9f6bfa00401beb4cf24b7a200c.tar gsoc2013-empathy-96a20bbc3f491b9f6bfa00401beb4cf24b7a200c.tar.gz gsoc2013-empathy-96a20bbc3f491b9f6bfa00401beb4cf24b7a200c.tar.bz2 gsoc2013-empathy-96a20bbc3f491b9f6bfa00401beb4cf24b7a200c.tar.lz gsoc2013-empathy-96a20bbc3f491b9f6bfa00401beb4cf24b7a200c.tar.xz gsoc2013-empathy-96a20bbc3f491b9f6bfa00401beb4cf24b7a200c.tar.zst gsoc2013-empathy-96a20bbc3f491b9f6bfa00401beb4cf24b7a200c.zip | |
Now that we depend on the logger always enable favourite contact support
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/configure.ac b/configure.ac index f93fb695a..7c7721231 100644 --- a/configure.ac +++ b/configure.ac @@ -422,7 +422,6 @@ if test "x$enable_meego" != "xno"; then if test "x$have_meego" = "xyes"; then AC_DEFINE(HAVE_MEEGO, 1, [Define if you have meego]) - chain_enable_favourite_contacts="yes" fi else have_meego="no" @@ -437,34 +436,6 @@ AC_SUBST(MEEGO_CFLAGS) AC_SUBST(MEEGO_LIBS) # ----------------------------------------------------------- -# favourite contacts support -# ----------------------------------------------------------- -AC_ARG_ENABLE(favourite_contacts, - AS_HELP_STRING([--enable-favourite-contacts=@<:no/yes@:>@], - [Enable favourite contacts]), , - enable_favourite_contacts=no) - -if test "x$enable_favourite_contacts" != "xno" || test "x$chain_enable_favourite_contacts" = "xyes"; then - PKG_CHECK_MODULES(TELEPATHY_LOGGER, - [ - telepathy-logger - ], have_telepathy_logger="yes", have_telepathy_logger="no") - - if test "x$have_telepathy_logger" = "xyes"; then - have_favourite_contacts="yes" - AC_DEFINE(HAVE_FAVOURITE_CONTACTS, 1, [Define if you want favourite contacts support]) - fi -else - have_favourite_contacts="no" -fi - -if test "x$enable_favourite_contacts" = "xyes" && test "x$have_favourite_contacts" != "xyes"; then - AC_MSG_ERROR([Couldn't find favourite contacts dependencies.]) -fi - -AM_CONDITIONAL(HAVE_FAVOURITE_CONTACTS, test "x$have_telepathy_logger" = "xyes") - -# ----------------------------------------------------------- # nautilus-sendto # ----------------------------------------------------------- AC_ARG_ENABLE(nautilus-sendto, @@ -560,7 +531,6 @@ Configure summary: Location awareness (Geoclue): ${have_geoclue} Adium themes (Webkit).......: ${have_webkit} Meego widgets ..............: ${have_meego} - Favourite contacts .........: ${have_favourite_contacts} Control center embedding....: ${have_control_center_embedding} Connectivity: |