Fixes for make distcheck

Signed-off-by: Ralph Boehme <rb@sernet.de>

diff --git a/configure.ac b/configure.ac
index 6f54a896ce37402f8edd86146de575e7b1f25069..2f89f8cc23206b391e07e575fb9c3f57ecce99a1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -209,7 +209,7 @@ AC_NETATALK_LOCKFILE
 dnl Check for Docbook and build documentation if found
 AX_CHECK_DOCBOOK
 
-CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include $CPPFLAGS"
+CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include -I\$(top_srcdir) $CPPFLAGS"
 UAMS_PATH="${uams_path}"
 
 AC_SUBST(LIBS)

diff --git a/test/afpd/Makefile.am b/test/afpd/Makefile.am
index f5109b8dd3f0658fa192e4c6f5cef851174335d4..eddfa8df7367a7990223ddedfe0f9f9b1794e1e3 100644 (file)
--- a/test/afpd/Makefile.am
+++ b/test/afpd/Makefile.am
@@ -38,17 +38,12 @@ test_SOURCES =  test.c subtests.c afpfunc_helpers.c \
                                $(top_srcdir)/etc/afpd/ofork.c \
                                $(top_srcdir)/etc/afpd/quota.c \
                                $(top_srcdir)/etc/afpd/status.c \
-                               $(top_srcdir)/etc/afpd/spotlight.c \
                                $(top_srcdir)/etc/afpd/spotlight_marshalling.c \
                                $(top_srcdir)/etc/afpd/switch.c \
                                $(top_srcdir)/etc/afpd/uam.c \
                                $(top_srcdir)/etc/afpd/unix.c \
                                $(top_srcdir)/etc/afpd/volume.c
 
-if HAVE_ACLS
-test_SOURCES += $(top_srcdir)/etc/afpd/acls.c
-endif
-
 test_CFLAGS = \
        -I$(top_srcdir)/etc/afpd \
        -I$(top_srcdir)/include \
@@ -67,6 +62,16 @@ test_LDADD = \
 
 test_LDFLAGS = -export-dynamic
 
+if HAVE_ACLS
+test_SOURCES += $(top_srcdir)/etc/afpd/acls.c
+endif
+
+if HAVE_TRACKER
+test_SOURCES += $(top_srcdir)/etc/afpd/spotlight.c
+test_LDADD += $(top_builddir)/etc/spotlight/libspotlight.la
+test_CFLAGS += @TRACKER_CFLAGS@
+endif
+
 if WITH_DTRACE
 DTRACE_OBJ = test-afp_dsi.o test-fork.o test-appl.o test-catsearch.o test-directory.o test-enumerate.o test-file.o test-filedir.o
 afp_dtrace.o: $(top_srcdir)/include/atalk/afp_dtrace.d $(DTRACE_OBJ)