diff options
| author | Seif Lotfy <seif@lotfy.com> | 2013-03-13 02:09:05 +0100 |
|---|---|---|
| committer | Seif Lotfy <seif@lotfy.com> | 2013-03-13 02:09:05 +0100 |
| commit | 6d901f61621e2bd2966976f3d1cabe02c0fceca9 (patch) | |
| tree | 3ba652e933369fa91f9d4404ea2d8e08a06a8dfd | |
| parent | a1ee18dcdc6877b132e0294a71166f29aab3052d (diff) | |
Try fixing Telepathy logger
| -rw-r--r-- | configure.ac | 42 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 19 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index e2ddd35..55bfb42 100644 --- a/configure.ac +++ b/configure.ac @@ -78,34 +78,26 @@ dnl ============================================== dnl Optional dependencies dnl ============================================== AC_ARG_ENABLE([telepathy], - 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 + 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") if test "x$enable_telepathy" = "xyes"; then - if test "x$have_telepathy" != "xyes"; then - AC_MSG_ERROR([Couldn't find telepathy-glib >= $MIN_TP_GLIB_VERSION.]) - fi + 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" 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]) @@ -132,6 +124,6 @@ ${PACKAGE}-${VERSION} Optional Providers Downloads Directory Monitor: ${with_downloads_monitor} - Telepathy Logger : ${have_telepathy} + Telepathy Logger : ${enable_telepathy} EOF diff --git a/src/Makefile.am b/src/Makefile.am index 5d222da..97ee62d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,8 +31,8 @@ zeitgeist_datahub_SOURCES = \ $(NULL) if HAVE_TELEPATHY -VALAFLAGS += --pkg telepathy-glib --define=HAVE_TELEPATHY -zeitgeist_datahub_SOURCES += telepathy-observer.vala + VALAFLAGS += --pkg telepathy-glib + zeitgeist_datahub_SOURCES += telepathy-observer.vala endif xdgautostart_in_files = \ |