From eb1aac4898a6e645769dd3536369f26d37bf38d6 Mon Sep 17 00:00:00 2001 From: Seif Lotfy Date: Sat, 16 Mar 2013 00:37:19 +0100 Subject: Merged Zeitgeist Datahub into same Zeitgeist Engine source for release purposes --- .gitignore | 4 ++++ Makefile.am | 6 ++++++ config.vapi | 2 ++ configure.ac | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- data/Makefile.am | 11 ++++++++++ doc/Makefile.am | 12 ++++++++--- 6 files changed, 96 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4402fba4..f368ef2c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ compile config.guess config.h config.h.in +config.h.in~ config.log config.status config.sub @@ -29,8 +30,11 @@ intltool-update.in intltool-merge.in intltool-extract.in po/Makefile.in.in +po/.intltool-merge-cache src/*.c src/*.stamp +datahub/*.c +datahub/*.stamp examples/*.c examples/*.stamp src/zeitgeist diff --git a/Makefile.am b/Makefile.am index 57c2fe41..3feaa0f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,10 @@ SUBDIRS = \ doc \ $(NULL) +if ENABLE_DATAHUB +SUBDIRS += datahub +endif + zeitgeistdocdir = $(pkgdatadir)/doc zeitgeistdoc_DATA = \ AUTHORS \ @@ -22,6 +26,8 @@ zeitgeistdoc_DATA = \ DISTCHECK_CONFIGURE_FLAGS = \ --with-session-bus-services-dir="\$(datadir)"/dbus-1/services \ + --enable-datahub \ + --enable-fts \ --enable-docs \ $(NULL) diff --git a/config.vapi b/config.vapi index 1322a8dd..bcb18952 100644 --- a/config.vapi +++ b/config.vapi @@ -4,4 +4,6 @@ namespace Config public const string GETTEXT_PACKAGE; public const string VERSION; public const string DATADIR; + + public const bool DOWNLOADS_MONITOR_ENABLED; } diff --git a/configure.ac b/configure.ac index 5848be8c..ea267ee4 100644 --- a/configure.ac +++ b/configure.ac @@ -40,14 +40,14 @@ ZEITGEIST_REQUIRED="glib-2.0 >= $GLIB_REQUIRED sqlite3 >= $SQLITE_REQUIRED" PKG_CHECK_MODULES(ZEITGEIST, [$ZEITGEIST_REQUIRED]) -AC_SUBST(ZEITGEIST_CFLAGS) -AC_SUBST(ZEITGEIST_LIBS) + AC_CONFIG_FILES([ Makefile src/Makefile libzeitgeist/Makefile libzeitgeist/zeitgeist-2.0.pc + datahub/Makefile extensions/Makefile extensions/fts++/Makefile extensions/fts++/test/Makefile @@ -140,6 +140,66 @@ if test "x$enable_fts" = "xyes"; then AC_SUBST(XAPIAN_CXXFLAGS) fi +################################################# +# Configure option: --enable-datahub +################################################# +JSON_GLIB_REQUIRED=0.14.0 +GTK_REQUIRED=3.0.0 + +ZEITGEIST_DATAHUB_REQUIRED="glib-2.0 >= $GLIB_REQUIRED + gobject-2.0 >= $GLIB_REQUIRED + gio-2.0 >= $GLIB_REQUIRED + gio-unix-2.0 >= $GLIB_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED + json-glib-1.0 >= $JSON_GLIB_REQUIRED" + +AC_ARG_ENABLE([datahub], + AS_HELP_STRING([--enable-datahub], [Whether to build zeitgeist-datahub]), + [enable_datahub=$enableval],[enable_datahub="yes"]) + +AM_CONDITIONAL(ENABLE_DATAHUB, test "x$enable_datahub" = "xyes") + +################################################# +# Additional provider for datahub +# Configure option: --enable-telepathy +################################################# +TELEPATHY_GLIB_REQUIRED=0.18.0 + +AC_ARG_ENABLE([telepathy], + AS_HELP_STRING([--disable-telepathy], [Disables the Telepathy]), + [enable_telepathy=$enableval],[enable_telepathy="yes"]) + +if test "x$enable_telepathy" = "xyes" -a "x$enable_datahub" = "xyes"; then + PKG_CHECK_MODULES(TELEPATHY_GLIB, [telepathy-glib >= $TELEPATHY_GLIB_REQUIRED]) + ZEITGEIST_DATAHUB_REQUIRED="$ZEITGEIST_DATAHUB_REQUIRED telepathy-glib >= $TELEPATHY_GLIB_REQUIRED" + AC_DEFINE([ENABLE_TELEPATHY], [1], [Is the Telepathy enabled?]) +else + enable_telepathy="no" +fi +AM_CONDITIONAL(ENABLE_TELEPATHY, test "x$enable_telepathy" = "xyes" -a "x$enable_datahub" = "xyes") + +################################################# +# Additional provider for datahub +# Configure option: --enable-downloads-monitor +################################################# + +AC_ARG_ENABLE([downloads-monitor], + AS_HELP_STRING([--disable-downloads-monitor], [Disables the XDG_DOWNLOAD_DIRECTORY file monitor]), + [enable_downloads_monitor=$enableval],[enable_downloads_monitor="yes"]) + +if test "x$enable_downloads_monitor" = "xyes" -a "x$enable_datahub" = "xyes"; then + AC_DEFINE([DOWNLOADS_MONITOR_ENABLED], [1], [Is the XDG_DOWNLOAD_DIRECTORY file monitor enabled?]) +fi +AM_CONDITIONAL(DOWNLOADS_MONITOR_ENABLED, test "x$enable_downloads_monitor" = "xyes" -a "x$enable_datahub" = "xyes") + + +################################################# +# Configure option: --enable-datahub +################################################# +if test "x$enable_datahub" = "xyes"; then + PKG_CHECK_MODULES(ZEITGEIST_DATAHUB, [$ZEITGEIST_DATAHUB_REQUIRED]) +fi + ################################################# # Libzeitgeist 2.0 ################################################# @@ -242,6 +302,8 @@ ${PACKAGE}-${VERSION} dee-icu: ${with_dee_icu} Other build options: + DataHub: ${enable_datahub} + Telepathy provider: ${enable_telepathy} SQL debugging: ${explain_queries} libzeitgeist docs: ${enable_docs} GObject Introspection: ${enable_introspection} diff --git a/data/Makefile.am b/data/Makefile.am index cf52e030..16982272 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -14,14 +14,25 @@ org.gnome.zeitgeist.service: Makefile bashcompletiondir = $(datadir)/bash-completion/completions dist_bashcompletion_DATA = completions/zeitgeist-daemon +xdgautostart_in_files = zeitgeist-datahub.desktop.in + +if ENABLE_DATAHUB +xdgautostartdir=$(sysconfdir)/xdg/autostart +xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop) +endif + +@INTLTOOL_DESKTOP_RULE@ + CLEANFILES = \ org.gnome.zeitgeist.service \ PythonSerializer.pyc \ + zeitgeist-datahub.desktop \ $(NULL) EXTRA_DIST = \ org.gnome.zeitgeist.service.in \ ontology2code \ + $(xdgautostart_in_files) \ $(NULL) all-local: org.gnome.zeitgeist.service diff --git a/doc/Makefile.am b/doc/Makefile.am index 74b2aa72..6e97c4cc 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -4,8 +4,14 @@ SUBDIRS = \ libzeitgeist \ $(NULL) -man_MANS = \ - zeitgeist-daemon.1 +man_MANS = zeitgeist-daemon.1 + +if ENABLE_DATAHUB +man_MANS += zeitgeist-datahub.1 +endif EXTRA_DIST = \ - $(man_MANS) + zeitgeist-daemon.1 \ + zeitgeist-datahub.1 \ + $(NULL) + -- cgit v1.2.1