Fixes

diff --git a/config/Makefile.am b/config/Makefile.am
index 1e2e6d3500e11d9686b48f8afa22292697ea213a..d7a0906e02c46e03b3025c19cbfe2059fa2eea67 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -68,6 +68,9 @@ install-config-files: $(CONFFILES) $(GENFILES)
        done
 if HAVE_TRACKER_RDF
        if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/tracker/tracker.cfg ; then \
+               if test ! -d $(DESTDIR)$(pkgconfdir)/tracker ; then \
+                       mkdir $(DESTDIR)$(pkgconfdir)/tracker ; \
+               fi ; \
                $(INSTALL_DATA) tracker.cfg $(DESTDIR)$(pkgconfdir)/tracker/ ; \
        fi
 endif

diff --git a/etc/netatalk/netatalk.c b/etc/netatalk/netatalk.c
index bcb29564a6b5385ef896e34c672958a193427dcf..81df96105a7c69cffb23da3f250dbe2f43a685ba 100644 (file)
--- a/etc/netatalk/netatalk.c
+++ b/etc/netatalk/netatalk.c
@@ -405,7 +405,12 @@ int main(int argc, char **argv)
     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
     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);

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 94ca82f59e5eb18932e62a7ccea00bb6739a1224..cafa285d5d7e3cd887170c179347c13c4317b245 100644 (file)
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -15,6 +15,7 @@ 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],
@@ -22,9 +23,9 @@ AC_DEFUN([AC_NETATALK_SPOTLIGHT], [
        [ac_cv_tracker_pkg=$withval],
        [ac_cv_tracker_pkg=$ac_cv_tracker_pkg_default])
 
-    PKG_CHECK_MODULES([TRACKER], [$ac_cv_tracker_pkg >= 0.12], [ac_cv_have_tracker=yes], [ac_cv_have_tracker=no])
+    PKG_CHECK_MODULES([TRACKER], [$ac_cv_tracker_pkg >= 0.12], [ac_cv_have_tracker_sparql=yes], [ac_cv_have_tracker_sparql=no])
 
-    if test x"$ac_cv_have_tracker" = x"no" ; then
+    if test x"$ac_cv_have_tracker_sparql" = x"no" ; then
         if test x"$need_tracker" = x"yes" ; then
             AC_MSG_ERROR([$ac_cv_tracker_pkg not found])
         fi
@@ -50,7 +51,7 @@ AC_DEFUN([AC_NETATALK_SPOTLIGHT], [
        fi
 
     dnl Test for Tracker 0.6 on Solaris and derived platforms
-    if test x"$this_os" = x"solaris" -a x"$ac_cv_have_tracker" = x"no" ; then
+    if test x"$this_os" = x"solaris" ; 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])
@@ -60,9 +61,12 @@ AC_DEFUN([AC_NETATALK_SPOTLIGHT], [
            fi
     fi
 
+    if test x"$ac_cv_have_tracker_sparql" = x"yes" -o x"$ac_cv_have_tracker_rdf" = x"yes" ; then
+       ac_cv_have_tracker=yes
+    fi
     AC_SUBST(TRACKER_CFLAGS)
     AC_SUBST(TRACKER_LIBS)
-    AM_CONDITIONAL(HAVE_TRACKER_SPARQL, [test x"$ac_cv_have_tracker" = x"yes"])
+    AM_CONDITIONAL(HAVE_TRACKER_SPARQL, [test x"$ac_cv_have_tracker_sparql" = x"yes"])
     AM_CONDITIONAL(HAVE_TRACKER_RDF, [test x"$ac_cv_have_tracker_rdf" = x"yes"])
 ])