Change dbus path option name to 'dbus daemon path' and add TRACKER_PREFIX define

diff --git a/etc/netatalk/netatalk.c b/etc/netatalk/netatalk.c
index 57e8ecf19ff28ade8bc4a3e635f3bb65805baa42..371e34aede87a1b9adb9e814fbc9b11ad020b37c 100644 (file)
--- a/etc/netatalk/netatalk.c
+++ b/etc/netatalk/netatalk.c
@@ -324,7 +324,7 @@ int main(int argc, char **argv)
     sigdelset(&blocksigs, SIGCHLD);
     sigprocmask(SIG_SETMASK, &blocksigs, NULL);
 
-    dbus_path = iniparser_getstring(obj.iniconfig, INISEC_GLOBAL, "dbus path", "/bin/dbus-daemon");
+    dbus_path = iniparser_getstring(obj.iniconfig, INISEC_GLOBAL, "dbus daemon path", "/bin/dbus-daemon");
     LOG(log_debug, logtype_default, "DBUS: '%s'", dbus_path);
     if ((dbus_pid = run_process(dbus_path, "--config-file=" _PATH_CONFDIR "dbus-session.conf", NULL)) == -1) {
         LOG(log_error, logtype_default, "Error starting '%s'", dbus_path);
@@ -334,7 +334,7 @@ int main(int argc, char **argv)
     sleep(1);
 
     setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=/tmp/spotlight.ipc", 1);
-    system("/usr/bin/tracker-control -s");
+    system(TRACKER_PREFIX "/bin/tracker-control -s");
 
     /* run the event loop */
     ret = event_base_dispatch(base);

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 72867803fcdac4c0d786e7b05dc030d0b7a8117d..c9ff000fde900ee0bd0e82ba6ee2585d3092e90a 100644 (file)
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -31,6 +31,8 @@ AC_DEFUN([AC_NETATALK_SPOTLIGHT], [
         fi
     else
         AC_DEFINE(HAVE_TRACKER, 1, [Define if Tracker library is available])
+        ac_cv_tracker_prefix=`pkg-config --variable=prefix $ac_cv_tracker_pkg`
+        AC_DEFINE_UNQUOTED(TRACKER_PREFIX, ["$ac_cv_tracker_prefix"], [Path to Tracker])
        fi
 
     AC_SUBST(TRACKER_CFLAGS)