From: Nick Bowler <nbowler@draconx.ca>
Date: Thu, 30 Apr 2015 04:41:19 +0000 (-0400)
Subject: Fix testsuite VPATH builds.
X-Git-Url: http://git.draconx.ca/gitweb/dxcommon.git/commitdiff_plain/6c8f7873ed3769c48b3bad95f92e5c32e7f6cec1

Fix testsuite VPATH builds.

Need to add -I$(srcdir) to all autom4te invocations, otherwise it will
try to find input files only in builddir.
---

diff --git a/snippet/autotest.mk b/snippet/autotest.mk
index 293a858..738e321 100644
--- a/snippet/autotest.mk
+++ b/snippet/autotest.mk
@@ -53,14 +53,17 @@ DX_AUTOTEST_ERROR = @:; { \
 	  printf 'Autoconf package: <https://gnu.org/s/autoconf/>\n'; \
 	} 1>&2; false
 
+DX_ATFLAGS = -I$(srcdir) $(ATFLAGS)
+
 testsuite: testsuite.at package.m4
 if !HAVE_AUTOTEST
 	$(DX_AUTOTEST_ERROR)
 endif
-	$(AM_V_GEN) $(AUTOTEST) $(ATFLAGS) -p m4_include -o $@.tmp testsuite.at
+	$(AM_V_GEN) $(AUTOTEST) $(DX_ATFLAGS) -p m4_include -o $@.tmp \
+	  testsuite.at
 	$(AM_V_at) :; { \
-	  $(AUTOTEST) $(ATFLAGS) -t m4_include:'$@: $$1' testsuite.at; \
-	  $(AUTOTEST) $(ATFLAGS) -t m4_include:'$$1:' testsuite.at; \
+	  $(AUTOTEST) $(DX_ATFLAGS) -t m4_include:'$@: $$1' testsuite.at; \
+	  $(AUTOTEST) $(DX_ATFLAGS) -t m4_include:'$$1:' testsuite.at; \
 	} >$(DEPDIR)/$(@F).P
 	$(AM_V_at) mv -f $@.tmp $@
 
@@ -68,7 +71,7 @@ testsuite.deps: testsuite
 if !HAVE_AUTOTEST
 	$(DX_AUTOTEST_ERROR)
 endif
-	$(AM_V_GEN) $(AUTOTEST) $(ATFLAGS) -t m4_include:'$$1' -o $@.tmp \
+	$(AM_V_GEN) $(AUTOTEST) $(DX_ATFLAGS) -t m4_include:'$$1' -o $@.tmp \
 	  testsuite.at
 	$(AM_V_at) mv -f $@.tmp $@