Portability fixes

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 6f1b7a8653a04d2d26218fdd0998978e41ec352a..3c98d49f367cccedbd4d2d4db0002d0e712828a6 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -3,7 +3,7 @@
 pkgconfdir = @PKGCONFDIR@
 
 sbin_PROGRAMS = afpd
-noinst_PROGRAMS = hash fce spot srp
+noinst_PROGRAMS = hash fce spot
 
 afpd_SOURCES = \
        afp_avahi.c \
@@ -68,7 +68,7 @@ noinst_HEADERS = auth.h afp_config.h desktop.h directory.h fce_api_internal.h fi
         filedir.h fork.h icon.h mangle.h misc.h status.h switch.h \
         uam_auth.h uid.h unix.h volume.h hash.h acls.h acl_mappings.h extattrs.h \
         dircache.h afp_zeroconf.h afp_avahi.h afp_mdns.h spotlight.h \
-        spotlight_rawquery_parser.h spotlight_SPARQL_map.h
+       spotlight_SPARQL_map.h
 
 hash_SOURCES = hash.c
 hash_CFLAGS = -DKAZLIB_TEST_MAIN -I$(top_srcdir)/include
@@ -77,14 +77,16 @@ fce_SOURCES = fce_api.c fce_util.c
 fce_CFLAGS = -DFCE_TEST_MAIN -I$(top_srcdir)/include
 fce_LDADD = $(top_builddir)/libatalk/libatalk.la
 
-AM_YFLAGS = -d
-BUILT_SOURCES = spotlight_rawquery_parser.h
-
-if HAVE_TRACKER
 spot_SOURCES = spotlight.c spotlight_marshalling.c
 spot_CFLAGS = -DSPOT_TEST_MAIN
 spot_LDADD = $(top_builddir)/libatalk/libatalk.la
 
+AM_YFLAGS = -d
+
+if HAVE_TRACKER
+BUILT_SOURCES = spotlight_rawquery_parser.h spotlight_rawquery_lexer.h
+noinst_PROGRAMS += srp
+
 moduledir = @UAMS_PATH@
 module_LTLIBRARIES = mod_spotlight.la
 

diff --git a/etc/netatalk/netatalk.c b/etc/netatalk/netatalk.c
index 03bab4909628f75a6ee2f87a0080d2e60f30072f..7039fd2ed519b31cabc5a68eb62739bfa3653eac 100644 (file)
--- a/etc/netatalk/netatalk.c
+++ b/etc/netatalk/netatalk.c
@@ -390,8 +390,12 @@ int main(int argc, char **argv)
 
     setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=/tmp/spotlight.ipc", 1);
     set_sl_volumes();
+#ifdef TRACKER_PREFIX
     system(TRACKER_PREFIX "/bin/tracker-control -s");
-
+#endif
+#ifdef SOLARIS
+    system("/usr/bin/trackerd");    
+#endif
     /* run the event loop */
     ret = event_base_dispatch(base);