1 From f3a73618755d39ae21a9ee1dc96ba43158fc0cac Mon Sep 17 00:00:00 2001
2 From: Kalev Lember <kalevlember@gmail.com>
3 Date: Sun, 27 Jan 2013 23:25:54 +0100
4 Subject: [PATCH] build: Simplify tracker version searching and support 0.16
7 Use an iterator instead of a deep dependency tree. This should simplify
8 adding support for new tracker versions in the future.
10 https://bugzilla.gnome.org/show_bug.cgi?id=692664
12 configure.ac | 23 ++++++++++++-----------
13 1 file changed, 12 insertions(+), 11 deletions(-)
15 diff --git a/configure.ac b/configure.ac
16 index 016c873..9f0b4af 100644
19 @@ -382,21 +382,22 @@ AC_ARG_ENABLE(search,
21 [enable_search="auto"])
23 +if test x"$enable_search" != "xno"; then
24 + # Try to figure out the tracker API version to use
26 + m4_foreach([VERSION], [[0.10], [0.12], [0.14], [0.16]],
27 + [PKG_CHECK_EXISTS([tracker-sparql-VERSION >= $TRACKER_REQUIRED],
28 + [tracker_api="VERSION"])
32 if test x"$enable_search" = "xauto"; then
33 - PKG_CHECK_EXISTS([tracker-sparql-0.14 >= $TRACKER_REQUIRED],
34 - [enable_search=yes],
35 - [PKG_CHECK_EXISTS([tracker-sparql-0.12 >= $TRACKER_REQUIRED],
36 - [enable_search=yes],
37 - [PKG_CHECK_EXISTS([tracker-sparql-0.10 >= $TRACKER_REQUIRED],
38 - [enable_search=yes],
39 - [enable_search=no])])])
40 + PKG_CHECK_EXISTS([tracker-sparql-$tracker_api >= $TRACKER_REQUIRED],
41 + [enable_search=yes],
45 if test x"$enable_search" = "xyes"; then
46 - PKG_CHECK_EXISTS([tracker-sparql-0.14 >= $TRACKER_REQUIRED],
48 - [PKG_CHECK_EXISTS([tracker-sparql-0.12 >= $TRACKER_REQUIRED],
49 - [tracker_api=0.12], [tracker_api=0.10])])
50 PKG_CHECK_MODULES(BRASERO_SEARCH, tracker-sparql-$tracker_api >= $TRACKER_REQUIRED)
51 AC_DEFINE(BUILD_SEARCH, 1, [define if you want to use search pane])
52 AC_DEFINE(BUILD_TRACKER, 1, [define if you want to use search pane])