[rygel] build: Fix building against tracker master
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] build: Fix building against tracker master
- Date: Fri, 30 Nov 2012 12:13:21 +0000 (UTC)
commit 4c5a8322cb732a55945d5d37585a609322276c62
Author: Jens Georg <jensg openismus com>
Date: Fri Nov 30 13:13:04 2012 +0100
build: Fix building against tracker master
configure.ac | 24 ++++++++++++++++++++++--
src/plugins/tracker/Makefile.am | 2 +-
2 files changed, 23 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 88c96f6..b9e8e15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -231,10 +231,29 @@ fi
AS_IF([test "x$enable_tracker_plugin" = "xyes"],
[
+ tracker_api_version="0.14"
PKG_CHECK_MODULES(TRACKER_SPARQL,
- tracker-sparql-0.14 >= $TRACKER_SPARQL_REQUIRED_MIN)
+ tracker-sparql-0.19 >= $TRACKER_SPARQL_REQUIRED_MIN,
+ [tracker_api_version="0.14"],
+ [tracker_api_version=""])
+ AS_IF([test "x$[]tracker_api_version" = "x"],
+ [
+ PKG_CHECK_MODULES(TRACKER_SPARQL,
+ tracker-sparql-0.15 >= $TRACKER_SPARQL_REQUIRED_MIN,
+ [tracker_api_version="0.15"],
+ [tracker_api_version=""])
+ ])
+ AS_IF([test "x$[]tracker_api_version" = "x"],
+ [
+ PKG_CHECK_MODULES(TRACKER_SPARQL,
+ tracker-sparql-0.16 >= $TRACKER_SPARQL_REQUIRED_MIN,
+ [tracker_api_version="0.16"],
+ [])
+ ])
AS_IF([test "x$enable_vala" = "xyes"],
- [VALA_CHECK_PACKAGES([tracker-sparql-0.14])])
+ [VALA_CHECK_PACKAGES([tracker-sparql-$tracker_api_version])])
+ TRACKER_API_VERSION=$tracker_api_version
+ AC_SUBST(TRACKER_API_VERSION)
])
dnl Gettext
@@ -338,6 +357,7 @@ echo "
Plugins:
examples: ${enable_example_plugins}
tracker: ${enable_tracker_plugin}
+ version: ${tracker_api_version}
mediathek: ${enable_mediathek_plugin}
media-export ${enable_media_export_plugin}
external: ${enable_external_plugin}
diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index 8ea4e50..abbcf09 100644
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -41,7 +41,7 @@ librygel_tracker_la_SOURCES = \
librygel_tracker_la_VALAFLAGS = \
--pkg posix \
- --pkg tracker-sparql-0.14 \
+ --pkg tracker-sparql- TRACKER_API_VERSION@ \
$(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS)
librygel_tracker_la_LIBADD = \
$(RYGEL_COMMON_SERVER_LIBS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]