[nautilus] tracker: make the tracker-sparql dependency optional
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] tracker: make the tracker-sparql dependency optional
- Date: Wed, 7 Sep 2011 22:44:53 +0000 (UTC)
commit ffc7c7f98901e8a319b91716d05e521a798dbe43
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Wed Sep 7 18:42:25 2011 -0400
tracker: make the tracker-sparql dependency optional
This way it's still possible to specify --enable-tracker=no from the
configure line if you want to avoid the tracker dependency.
configure.in | 23 +++++++++++++++++++++++
libnautilus-private/Makefile.am | 9 +++++++--
libnautilus-private/nautilus-search-engine.c | 5 +++++
3 files changed, 35 insertions(+), 2 deletions(-)
---
diff --git a/configure.in b/configure.in
index 43baf71..d835684 100644
--- a/configure.in
+++ b/configure.in
@@ -268,6 +268,28 @@ AC_TRY_RUN([#include <time.h>
AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.])
)
+dnl ===========================================================================
+dnl Check for Tracker
+dnl ===========================================================================
+
+AC_ARG_ENABLE(tracker,
+ [AS_HELP_STRING([--enable-tracker=@<:@yes/no/auto@:>@],
+ [build Tracker builtin support [default=auto]])],
+ [enable_tracker="$enableval"],
+ [enable_tracker=auto])
+if test "$enable_tracker" = "auto"; then
+ enable_tracker=yes
+fi
+
+build_tracker=no
+if test "x$enable_tracker" != "xno"; then
+ PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12, [
+ build_tracker=yes
+ AC_DEFINE(ENABLE_TRACKER, 1, [Define to enable Tracker support])])
+fi
+
+AM_CONDITIONAL(ENABLE_TRACKER, test "x$build_tracker" = "xyes")
+
dnl ==========================================================================
dnl base libs
@@ -361,6 +383,7 @@ nautilus-$VERSION:
libexempi support: $msg_xmp
PackageKit support: $msg_packagekit
nautilus-sendto ext: $enable_nst_extension
+ Tracker support: $build_tracker
profiling support: ${profiling_support}
debugging support: ${enable_debug}
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 4885ab3..e41118f 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -32,6 +32,12 @@ BUILT_SOURCES = \
$(dbus_built_sources) \
$(NULL)
+if ENABLE_TRACKER
+nautilus_tracker_engine_sources = \
+ nautilus-search-engine-tracker.c \
+ nautilus-search-engine-tracker.h
+endif
+
dependency_static_libs = \
$(top_builddir)/cut-n-paste-code/libegg/libegg.la \
$(NULL)
@@ -157,8 +163,6 @@ libnautilus_private_la_SOURCES = \
nautilus-search-engine.h \
nautilus-search-engine-simple.c \
nautilus-search-engine-simple.h \
- nautilus-search-engine-tracker.c \
- nautilus-search-engine-tracker.h \
nautilus-selection-canvas-item.c \
nautilus-selection-canvas-item.h \
nautilus-signaller.h \
@@ -188,6 +192,7 @@ libnautilus_private_la_SOURCES = \
nautilus-vfs-directory.h \
nautilus-vfs-file.c \
nautilus-vfs-file.h \
+ $(nautilus_tracker_engine_sources) \
$(NULL)
nodist_libnautilus_private_la_SOURCES =\
diff --git a/libnautilus-private/nautilus-search-engine.c b/libnautilus-private/nautilus-search-engine.c
index 0274646..e4952d2 100644
--- a/libnautilus-private/nautilus-search-engine.c
+++ b/libnautilus-private/nautilus-search-engine.c
@@ -24,7 +24,10 @@
#include <config.h>
#include "nautilus-search-engine.h"
#include "nautilus-search-engine-simple.h"
+
+#ifdef ENABLE_TRACKER
#include "nautilus-search-engine-tracker.h"
+#endif
#include <eel/eel-gtk-macros.h>
@@ -125,10 +128,12 @@ nautilus_search_engine_new (void)
{
NautilusSearchEngine *engine;
+#ifdef ENABLE_TRACKER
engine = nautilus_search_engine_tracker_new ();
if (engine) {
return engine;
}
+#endif
engine = nautilus_search_engine_simple_new ();
return engine;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]