From: Stefano Lattarini Date: Wed, 31 Oct 2012 11:41:13 +0000 (+0100) Subject: Merge branch 'maint' X-Git-Tag: v1.12b~36 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=153f861b91221d14842c495efa0b1f10d9455855;p=thirdparty%2Fautomake.git Merge branch 'maint' * maint: vala tests: source test-init.sh, not ./defs tests: fix a spurious typo-related failure tests: remove spurious leftover use of 'Exit' tests: can check our recipes avoid trailing backslashes vala: improve comments to AM_PROG_VALAC news: update w.r.t. recent vala changes vala: if no proper compiler found, set $(VALAC) to 'valac' vala: AM_PROG_VALAC should not produce an error for tool-old valac docs: document recent changes to AM_PROG_VALAC tests: enhance tests on AM_PROG_VALAC vala: style fixes in vala.m4 vala: add action arguments, for when no proper vala compiler is found Signed-off-by: Stefano Lattarini --- 153f861b91221d14842c495efa0b1f10d9455855 diff --cc Makefile.am index ddf71b38c,45bf2fce4..065500f90 --- a/Makefile.am +++ b/Makefile.am @@@ -484,8 -497,19 +497,19 @@@ check-tests-syntax check-local: check-tests-syntax .PHONY: check-tests-syntax + # Recipes with a trailing backslash character (possibly followed by + # blank characters only) can cause spurious syntax errors with at + # least older bash versions (e.g., bash 2.05b), and can be potentially + # be unportable to other weaker shells. Run the testsuite in a way + # that helps catching such problems in Automake-generated recipes. + # See automake bug#10436. + check-no-trailing-backslash-in-recipes: + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) check \ + CONFIG_SHELL='$(abs_top_builddir)/t/ax/shell-no-trail-bslash' + .PHONY: check-no-trailing-backslash-in-recipes + ## Checking the list of tests. -test_subdirs = t t/pm +test_subdirs = t t/pm contrib/t include $(srcdir)/t/CheckListOfTests.am # Run the testsuite with the installed aclocal and automake.