[nautilus] Depend on Tracker



commit edf1e832c83f1fc90d4cd3b5098121227c4abdb3
Author: William Jon McCann <jmccann redhat com>
Date:   Wed Jul 18 10:46:09 2012 -0400

    Depend on Tracker
    
    Unless built explicitly with --disable-tracker.

 configure.in |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/configure.in b/configure.in
index 0fce54b..415d731 100644
--- a/configure.in
+++ b/configure.in
@@ -234,24 +234,17 @@ dnl Check for Tracker
 dnl ===========================================================================
 
 AC_ARG_ENABLE(tracker,
-              [AS_HELP_STRING([--enable-tracker=@<:@yes/no/auto@:>@],
-                              [build Tracker builtin support [default=auto]])],
+              [AS_HELP_STRING([--enable-tracker=@<:@yes/no@:>@],
+                              [build Tracker builtin support [default=yes]])],
               [enable_tracker="$enableval"],
-              [enable_tracker=auto])
+              [enable_tracker=yes])
 
-build_tracker=no
 if test "x$enable_tracker" != "xno"; then
-  PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.14,
-                    [build_tracker=yes],
-                    [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12,
-		                       [build_tracker=yes],
-                                       [build_tracker=no])])
-  if test "x$build_tracker" = "xyes"; then
-    AC_DEFINE(ENABLE_TRACKER, 1, [Define to enable Tracker support])
-  fi
+  PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.14)
+  AC_DEFINE(ENABLE_TRACKER, 1, [Define to enable Tracker support])
 fi
 
-AM_CONDITIONAL(ENABLE_TRACKER, test "x$build_tracker" = "xyes")
+AM_CONDITIONAL(ENABLE_TRACKER, test "x$enable_tracker" = "xyes")
 
 dnl ==========================================================================
 	
@@ -346,7 +339,7 @@ nautilus-$VERSION:
 	libexempi support:	$msg_xmp
 	PackageKit support:     $msg_packagekit
 	nautilus-sendto ext:	$enable_nst_extension
-	Tracker support:	$build_tracker
+	Tracker support:	$enable_tracker
 
         debugging support:      ${enable_debug}
 	nautilus-extension documentation: ${enable_gtk_doc}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]