if (trackerd_pid == -1) {
trackerd_restarts++;
LOG(log_note, logtype_afpd, "Restarting 'trackerd' (restarts: %u)", trackerd_restarts);
- if ((trackerd_pid = run_process(TRACKER_RDF_PREFIX "/bin/trackerd", trackerd_loglev, NULL)) == -1) {
+ if ((trackerd_pid = run_process(TRACKERD_PATH, trackerd_loglev, NULL)) == -1) {
LOG(log_error, logtype_default, "Error starting '%s'", "/usr/bin/trackerd");
}
}
setenv("XDG_CONFIG_HOME", _PATH_CONFDIR, 0);
#endif
-#ifdef HAVE_TRACKER_RDF
- /* This assumes Tracker 0.6 with RDF is only used on Solaris and derived platforms */
- dbus_path = iniparser_getstring(obj.iniconfig, INISEC_GLOBAL, "dbus daemon path", "/usr/lib/dbus-daemon");
-#else
- dbus_path = iniparser_getstring(obj.iniconfig, INISEC_GLOBAL, "dbus daemon path", "/bin/dbus-daemon");
-#endif
+ dbus_path = iniparser_getstring(obj.iniconfig, INISEC_GLOBAL, "dbus daemon path", DBUS_DAEMON_PATH);
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);
#ifdef HAVE_TRACKER_RDF
if (asprintf(&trackerd_loglev, "--verbosity=%d", obj.options.tracker_loglevel) == -1)
netatalk_exit(EXITERR_CONF);
- if ((trackerd_pid = run_process(TRACKER_RDF_PREFIX "/bin/trackerd", trackerd_loglev, NULL)) == -1) {
- LOG(log_error, logtype_default, "Error starting '%s'", TRACKER_RDF_PREFIX "/bin/trackerd");
+ if ((trackerd_pid = run_process(TRACKERD_PATH, trackerd_loglev, NULL)) == -1) {
+ LOG(log_error, logtype_default, "Error starting '%s'", TRACKERD_PATH);
netatalk_exit(EXITERR_CONF);
}
#endif
AC_DEFINE(HAVE_TRACKER_SPARQL, 1, [Define if Tracker SPARQL 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])
+ AC_DEFINE([DBUS_DAEMON_PATH], ["/bin/dbus-daemon"], [Path to dbus-daemon])
fi
ac_cv_tracker_miner_pkg_default=tracker-miner-0.12
AC_SUBST(TRACKER_MINER_LIBS)
fi
- dnl Test for Tracker 0.6 on Solaris and derived platforms
- if test x"$this_os" = x"solaris" ; then
+ 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])
- ac_cv_tracker_prefix=`pkg-config --variable=prefix tracker`
- AC_DEFINE_UNQUOTED(TRACKER_RDF_PREFIX, ["$ac_cv_tracker_prefix"], [Path to Tracker])
+ 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