diff options
| author | Seif Lotfy <seif@lotfy.com> | 2013-03-13 20:41:01 +0100 |
|---|---|---|
| committer | Seif Lotfy <seif@lotfy.com> | 2013-03-13 20:41:01 +0100 |
| commit | dcdaa99d305e2fd71ade313cfd1bf3654a9e382e (patch) | |
| tree | fbe30a37a938503f86ea6ddde06100e26e7aa996 | |
| parent | 96e1e5fff445edd0074d4251d73114e618320383 (diff) | |
Initial fix for makefile
| -rw-r--r-- | configure.ac | 36 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/zeitgeist-datahub.vala | 2 |
3 files changed, 17 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index b16db68..b135794 100644 --- a/configure.ac +++ b/configure.ac @@ -77,34 +77,24 @@ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= $MIN_GTK_VERSION]) dnl ============================================== dnl Optional dependencies dnl ============================================== -AC_ARG_ENABLE([telepathy], - AS_HELP_STRING([--disable-telepathy], - [disable Telepathy [[default=auto]]]),[enable_telepathy=no]) - - -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" +AC_ARG_ENABLE([telepathy], + AS_HELP_STRING([--enable-telepathy[=@<:@no/auto/yes@:>@]],[Build with Telepathy support]), + [enable_telepathy=$enableval], + [enable_telepathy="auto"]) - if test "x$have_telepathy" = "xyes"; then - AC_DEFINE(HAVE_TELEPATHY, [], [Define if we have TELEPATHY_GLIB]) - fi -else - have_telepathy="no (disabled)" +if test "x$enable_telepathy" = "xauto" ; then + PKG_CHECK_EXISTS([telepathy-glib >= $MIN_TP_GLIB_VERSION], \ + enable_telepathy="yes", enable_telepathy="no") fi -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 +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" fi -AM_CONDITIONAL(HAVE_TELEPATHY, test "x$have_telepathy" = "xyes") +AM_CONDITIONAL(ENABLE_TELEPATHY, test x"$enable_telepathy" = "xyes") dnl Expansions dnl AS_AC_EXPAND([PKGDATADIR], [$datadir/$PACKAGE_NAME]) @@ -132,6 +122,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 97ee62d..b0380bd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,9 +30,9 @@ zeitgeist_datahub_SOURCES = \ $(optional_zeitgeist_datahub_SOURCES) \ $(NULL) -if HAVE_TELEPATHY - VALAFLAGS += --pkg telepathy-glib - zeitgeist_datahub_SOURCES += telepathy-observer.vala +if ENABLE_TELEPATHY +VALAFLAGS += --pkg telepathy-glib +zeitgeist_datahub_SOURCES += telepathy-observer.vala endif xdgautostart_in_files = \ diff --git a/src/zeitgeist-datahub.vala b/src/zeitgeist-datahub.vala index 7375274..7bdf4c6 100644 --- a/src/zeitgeist-datahub.vala +++ b/src/zeitgeist-datahub.vala @@ -112,7 +112,7 @@ public class DataHub : Object, DataHubService providers.prepend (new RecentManagerGtk (this)); providers.prepend (new RecentDocumentsKDE (this)); -#if HAVE_TELEPATHY +#if ENABLE_TELEPATHY providers.prepend (new TelepathyObserver (this)); #endif |