From a570778bc4b66d1fce5314d8e6a9f72f18a733ad Mon Sep 17 00:00:00 2001 From: Luis de Bethencourt Date: Thu, 2 Feb 2012 16:07:21 +0000 Subject: [PATCH] tracker: Add Tracker-Sparql to dependency modules. --- configure.ac | 13 +++++++++++++ src/plugins/tracker/Makefile.am | 9 ++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 3dd7aec..6394a17 100644 --- a/configure.ac +++ b/configure.ac @@ -49,6 +49,10 @@ GSTREAMER_TAG_REQUIRED=0.10.28 GSTREAMER_APP_REQUIRED=0.10.28 LIBSQLITE3_REQUIRED=3.5 +dnl Additional requirements for tracker plugin +TRACKER_SPARQL_REQUIRED_MIN=0.12.7 +TRACKER_SPARQL_REQUIRED_MAX=0.12.9999 + PKG_CHECK_MODULES(LIBGLIB, glib-2.0 >= $GLIB_REQUIRED) VALAFLAGS="--target-glib=2.32 $VALAFLAGS" @@ -183,6 +187,15 @@ then fi fi +AS_IF([test "x$enable_tracker_plugin" = "xyes"], + [ + PKG_CHECK_MODULES(TRACKER_SPARQL, + tracker-sparql-0.12 >= $TRACKER_SPARQL_REQUIRED_MIN + tracker-sparql-0.12 <= $TRACKER_SPARQL_REQUIRED_MAX) + AS_IF([test "x$enable_vala" = "xyes"], + [VALA_CHECK_PACKAGES([tracker-sparql-0.12])]) + ]) + dnl Gettext GETTEXT_PACKAGE=rygel AC_SUBST(GETTEXT_PACKAGE) diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am index 889d15a..68029dd 100644 --- a/src/plugins/tracker/Makefile.am +++ b/src/plugins/tracker/Makefile.am @@ -2,7 +2,9 @@ include ../../../common.am plugin_LTLIBRARIES = librygel-tracker.la -AM_CFLAGS += -DG_LOG_DOMAIN='"Tracker"' $(LIBGUPNP_DLNA_CFLAGS) +AM_CFLAGS += -DG_LOG_DOMAIN='"Tracker"' \ + $(LIBGUPNP_DLNA_CFLAGS) \ + $(TRACKER_SPARQL_CFLAGS) librygel_tracker_la_SOURCES = \ rygel-tracker-root-container.vala \ @@ -38,11 +40,12 @@ librygel_tracker_la_SOURCES = \ rygel-tracker-music-item-factory.vala \ rygel-tracker-picture-item-factory.vala \ rygel-tracker-plugin.vala \ - rygel-tracker-plugin-factory.vala \ rygel-tracker-interfaces.vala librygel_tracker_la_VALAFLAGS = --pkg posix \ --pkg gupnp-dlna-1.0 \ + --pkg tracker-sparql-0.12 \ $(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS) -librygel_tracker_la_LIBADD = $(RYGEL_COMMON_SERVER_LIBS) $(LIBGUPNP_DLNA_LIBS) +librygel_tracker_la_LIBADD = $(RYGEL_COMMON_SERVER_LIBS) $(LIBGUPNP_DLNA_LIBS) \ + $(TRACKER_SPARQL_LIBS) librygel_tracker_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS) -- 2.7.4