X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2FMakefile.local;h=2b18bdb92af1b43bcbe25dc15fd6f1e66fc935a2;hb=d5822224da58b93f1c3851a149c2f787acd9c401;hp=36b1c1b71de08f598f4b9e314170a3e186c14ec4;hpb=b21f0f68029173035de6616b63320b36d5b1d009;p=notmuch

diff --git a/test/Makefile.local b/test/Makefile.local
index 36b1c1b7..2b18bdb9 100644
--- a/test/Makefile.local
+++ b/test/Makefile.local
@@ -4,7 +4,7 @@ dir := test
 
 # save against changes in $(dir)
 test_src_dir := $(dir)
-extra_cflags += -I.
+extra_cflags += -I$(srcdir)
 
 smtp_dummy_srcs =		\
 	$(notmuch_compat_srcs)	\
@@ -13,10 +13,10 @@ smtp_dummy_srcs =		\
 smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o)
 
 $(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libutil.a
-	$(call quiet,CC) -I. $^ -o $@
+	$(call quiet,CC) $^ -o $@
 
 $(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a
-	$(call quiet,CC) -I. $^ -o $@ -ltalloc
+	$(call quiet,CC) $^ -o $@ -ltalloc
 
 random_corpus_deps =  $(dir)/random-corpus.o  $(dir)/database-test.o \
 			notmuch-config.o command-line-arguments.o \
@@ -35,9 +35,17 @@ $(dir)/symbol-test: $(dir)/symbol-test.o lib/$(LINKER_NAME)
 $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o
 	$(call quiet,CC) $^ -o $@
 
+$(dir)/have-compact: Makefile.config
+ifeq ($(HAVE_XAPIAN_COMPACT),1)
+	ln -sf /bin/true $@
+else
+	ln -sf /bin/false $@
+endif
+
 .PHONY: test check
 
 TEST_BINARIES=$(dir)/arg-test \
+	      $(dir)/have-compact \
 	      $(dir)/hex-xcode \
 	      $(dir)/random-corpus \
 	      $(dir)/parse-time \