Try using Tracker 0.15 from OpenCSW

[netatalk.git] / macros / netatalk.m4

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 790fead60c08c2ce652e220876d39da417f0db10..21846ba4a2bcd3c3c897efcdce20a6113a36197b 100644 (file)
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -143,14 +143,25 @@ AC_DEFUN([AC_DEVELOPER], [
 dnl Tracker, for Spotlight
 AC_DEFUN([AC_NETATALK_SPOTLIGHT], [
     ac_cv_have_tracker=no
+
     dnl Tracker SPARQL
     ac_cv_tracker_pkg_default=tracker-sparql-0.12
     AC_ARG_WITH([tracker-pkg-config],
-       [AS_HELP_STRING([--with-tracker-pkg-config],[name of the Tracker SPARQL pkg in pkg-config])],
-       [ac_cv_tracker_pkg=$withval],
-       [ac_cv_tracker_pkg=$ac_cv_tracker_pkg_default])
+      [AS_HELP_STRING([--with-tracker-pkg-config],[name of the Tracker SPARQL pkg in pkg-config])],
+      [ac_cv_tracker_pkg=$withval],
+      [ac_cv_tracker_pkg=$ac_cv_tracker_pkg_default]
+    )
+
+    AC_ARG_WITH([tracker-prefix],
+      [AS_HELP_STRING([--with-tracker-prefix],[prefix of Tracker installation (default: none)])],
+      [ac_cv_tracker_prefix=$withval],
+      [ac_cv_tracker_prefix=""]
+    )
 
+    saved_PATH="$PATH"
+    PATH="$ac_cv_tracker_prefix:$PATH"
     PKG_CHECK_MODULES([TRACKER], [$ac_cv_tracker_pkg >= 0.12], [ac_cv_have_tracker_sparql=yes], [ac_cv_have_tracker_sparql=no])
+    PATH="$saved_PATH"
 
     if test x"$ac_cv_have_tracker_sparql" = x"no" ; then
         if test x"$need_tracker" = x"yes" ; then
@@ -162,13 +173,14 @@ AC_DEFUN([AC_NETATALK_SPOTLIGHT], [
         ac_cv_tracker_prefix=`pkg-config --variable=prefix $ac_cv_tracker_pkg`
         AC_DEFINE_UNQUOTED(TRACKER_PREFIX, ["$ac_cv_tracker_prefix"], [Path to Tracker])
         AC_DEFINE([DBUS_DAEMON_PATH], ["/bin/dbus-daemon"], [Path to dbus-daemon])
-       fi
+    fi
 
     ac_cv_tracker_miner_pkg_default=tracker-miner-0.12
     AC_ARG_WITH([tracker-miner-pkg-config],
-       [AS_HELP_STRING([--with-tracker-miner-pkg-config],[name of the Tracker miner pkg in pkg-config])],
-       [ac_cv_tracker_miner_pkg=$withval],
-       [ac_cv_tracker_miner_pkg=$ac_cv_tracker_miner_pkg_default])
+      [AS_HELP_STRING([--with-tracker-miner-pkg-config],[name of the Tracker miner pkg in pkg-config])],
+      [ac_cv_tracker_miner_pkg=$withval],
+      [ac_cv_tracker_miner_pkg=$ac_cv_tracker_miner_pkg_default]
+    )
 
     PKG_CHECK_MODULES([TRACKER_MINER], [$ac_cv_tracker_miner_pkg >= 0.12], [ac_cv_have_tracker_miner=yes], [ac_cv_have_tracker_miner=no])
 
@@ -176,25 +188,27 @@ AC_DEFUN([AC_NETATALK_SPOTLIGHT], [
         AC_DEFINE(HAVE_TRACKER_MINER, 1, [Define if Tracker miner library is available])
         AC_SUBST(TRACKER_MINER_CFLAGS)
         AC_SUBST(TRACKER_MINER_LIBS)
-       fi
+    fi
 
     dnl Test for Tracker 0.6 on Solaris and derived platforms, and FreeBSD
-    if test x"$this_os" = x"solaris" -o x"$this_os" = x"freebsd" ; then
-        PKG_CHECK_MODULES([TRACKER], [tracker >= 0.6], [ac_cv_have_tracker_rdf=yes], [ac_cv_have_tracker_rdf=no])
-        if test x"$ac_cv_have_tracker_rdf" = x"yes" ; then
-            AC_DEFINE(HAVE_TRACKER, 1, [Define if Tracker is available])
-            AC_DEFINE(HAVE_TRACKER_RDF, 1, [Define if Tracker 0.6 with support for RDF queries is available])
-            case "$this_os" in
-            *solaris*)
-                AC_DEFINE([DBUS_DAEMON_PATH], ["/usr/lib/dbus-daemon"], [Path to dbus-daemon])
-                AC_DEFINE([TRACKERD_PATH], ["/bin/trackerd"], [Path to trackerd])
-                ;;
-            *freebsd*)
-                AC_DEFINE([DBUS_DAEMON_PATH], ["/usr/local/bin/dbus-daemon"], [Path to dbus-daemon])
-                AC_DEFINE([TRACKERD_PATH], ["/usr/local/libexec/trackerd"], [Path to trackerd])
-                ;;
-            esac
-           fi
+    if test x"$ac_cv_have_tracker_sparql" != x"yes" ; then
+        if test x"$this_os" = x"solaris" -o x"$this_os" = x"freebsd" ; then
+            PKG_CHECK_MODULES([TRACKER], [tracker >= 0.6], [ac_cv_have_tracker_rdf=yes], [ac_cv_have_tracker_rdf=no])
+            if test x"$ac_cv_have_tracker_rdf" = x"yes" ; then
+                AC_DEFINE(HAVE_TRACKER, 1, [Define if Tracker is available])
+                AC_DEFINE(HAVE_TRACKER_RDF, 1, [Define if Tracker 0.6 with support for RDF queries is available])
+                case "$this_os" in
+                *solaris*)
+                    AC_DEFINE([DBUS_DAEMON_PATH], ["/usr/lib/dbus-daemon"], [Path to dbus-daemon])
+                    AC_DEFINE([TRACKERD_PATH], ["/bin/trackerd"], [Path to trackerd])
+                    ;;
+                *freebsd*)
+                    AC_DEFINE([DBUS_DAEMON_PATH], ["/usr/local/bin/dbus-daemon"], [Path to dbus-daemon])
+                    AC_DEFINE([TRACKERD_PATH], ["/usr/local/libexec/trackerd"], [Path to trackerd])
+                    ;;
+                esac
+            fi
+        fi
     fi
 
     if test x"$ac_cv_have_tracker_sparql" = x"yes" -o x"$ac_cv_have_tracker_rdf" = x"yes" ; then