diff options
| author | Seif Lotfy <seif@lotfy.com> | 2013-03-13 10:19:28 +0100 |
|---|---|---|
| committer | Seif Lotfy <seif@lotfy.com> | 2013-03-13 10:19:28 +0100 |
| commit | c665e181794fb9f18cc9ca3a0cfa376a0fb6c6b3 (patch) | |
| tree | a35405d44a14dbeb41fd7d64c82cfb46bb568ed8 | |
| parent | 6d901f61621e2bd2966976f3d1cabe02c0fceca9 (diff) | |
revert configure.ac
| -rw-r--r-- | configure.ac | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 55bfb42..e2ddd35 100644 --- a/configure.ac +++ b/configure.ac @@ -78,26 +78,34 @@ dnl ============================================== dnl Optional dependencies dnl ============================================== AC_ARG_ENABLE([telepathy], - AS_HELP_STRING([--enable-telepathy], - [Enable Telepathy Logging]), - [ - if test "x$enableval" = "xyes"; then - enable_telepathy=yes - else - enable_telepathy=no - fi - ], - [enable_telepathy=no]) - -AC_DEFINE([HAVE_TELEPATHY], [1], [Is the XDG_DOWNLOAD_DIRECTORY file monitor enabled?]) -AM_CONDITIONAL(HAVE_TELEPATHY, test "x$enable_telepathy" = "xyes") + AS_HELP_STRING([--disable-telepathy], + [disable Telepathy [[default=auto]]]),, + [enable_telepathy=auto]) + +if test "x$enable_telepathy" != "xno"; then + PKG_CHECK_MODULES(TELEPATHY_GLIB, + [telepathy-glib >= $MIN_TP_GLIB_VERSION], + [have_telepathy=yes], + [have_telepathy=no]) + + DATAHUB_MODULES_CFLAGS="$DATAHUB_MODULES_CFLAGS $TELEPATHY_GLIB_CFLAGS" + DATAHUB_MODULES_LIBS="$DATAHUB_MODULES_LIBS $TELEPATHY_GLIB_LIBS" + + if test "x$have_telepathy" = "xyes"; then + AC_DEFINE(HAVE_TELEPATHY, [], [Define if we have TELEPATHY_GLIB]) + fi +else + have_telepathy="no (disabled)" +fi if test "x$enable_telepathy" = "xyes"; then - PKG_CHECK_MODULES(TELEPATHY_GLIB, [telepathy-glib >= $MIN_TP_GLIB_VERSION]) - DATAHUB_MODULES_CFLAGS="$DATAHUB_MODULES_CFLAGS $TELEPATHY_GLIB_CFLAGS" - DATAHUB_MODULES_LIBS="$DATAHUB_MODULES_LIBS $TELEPATHY_GLIB_LIBS" + if test "x$have_telepathy" != "xyes"; then + AC_MSG_ERROR([Couldn't find telepathy-glib >= $MIN_TP_GLIB_VERSION.]) + fi fi +AM_CONDITIONAL(HAVE_TELEPATHY, test "x$have_telepathy" = "xyes") + dnl Expansions dnl AS_AC_EXPAND([PKGDATADIR], [$datadir/$PACKAGE_NAME]) dnl AS_AC_EXPAND([DATADIR], [$datadir]) @@ -124,6 +132,6 @@ ${PACKAGE}-${VERSION} Optional Providers Downloads Directory Monitor: ${with_downloads_monitor} - Telepathy Logger : ${enable_telepathy} + Telepathy Logger : ${have_telepathy} EOF |