You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
51 lines
2.3 KiB
51 lines
2.3 KiB
From 45cecda00ae84b4aaa872430ff3e8ad40bd98df6 Mon Sep 17 00:00:00 2001
|
|
From: Kalev Lember <kalevlember@gmail.com>
|
|
Date: Sun, 27 Jan 2013 22:25:54 +0000
|
|
Subject: build: Simplify tracker version searching and support 0.16 API
|
|
|
|
Use an iterator instead of a deep dependency tree. This should simplify
|
|
adding support for new tracker versions in the future.
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=692664
|
|
---
|
|
diff --git a/configure.ac b/configure.ac
|
|
index ce79401..d77bffe 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -382,21 +382,22 @@ AC_ARG_ENABLE(search,
|
|
esac],
|
|
[enable_search="auto"])
|
|
|
|
+if test x"$enable_search" != "xno"; then
|
|
+ # Try to figure out the tracker API version to use
|
|
+ tracker_api="0.10"
|
|
+ m4_foreach([VERSION], [[0.10], [0.12], [0.14], [0.16]],
|
|
+ [PKG_CHECK_EXISTS([tracker-sparql-VERSION >= $TRACKER_REQUIRED],
|
|
+ [tracker_api="VERSION"])
|
|
+ ])
|
|
+fi
|
|
+
|
|
if test x"$enable_search" = "xauto"; then
|
|
- PKG_CHECK_EXISTS([tracker-sparql-0.14 >= $TRACKER_REQUIRED],
|
|
- [enable_search=yes],
|
|
- [PKG_CHECK_EXISTS([tracker-sparql-0.12 >= $TRACKER_REQUIRED],
|
|
- [enable_search=yes],
|
|
- [PKG_CHECK_EXISTS([tracker-sparql-0.10 >= $TRACKER_REQUIRED],
|
|
- [enable_search=yes],
|
|
- [enable_search=no])])])
|
|
+ PKG_CHECK_EXISTS([tracker-sparql-$tracker_api >= $TRACKER_REQUIRED],
|
|
+ [enable_search=yes],
|
|
+ [enable_search=no])
|
|
fi
|
|
|
|
if test x"$enable_search" = "xyes"; then
|
|
- PKG_CHECK_EXISTS([tracker-sparql-0.14 >= $TRACKER_REQUIRED],
|
|
- [tracker_api=0.14],
|
|
- [PKG_CHECK_EXISTS([tracker-sparql-0.12 >= $TRACKER_REQUIRED],
|
|
- [tracker_api=0.12], [tracker_api=0.10])])
|
|
PKG_CHECK_MODULES(BRASERO_SEARCH, tracker-sparql-$tracker_api >= $TRACKER_REQUIRED)
|
|
AC_DEFINE(BUILD_SEARCH, 1, [define if you want to use search pane])
|
|
AC_DEFINE(BUILD_TRACKER, 1, [define if you want to use search pane])
|
|
--
|
|
cgit v0.9.1
|