From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 27 Oct 2012 18:26:02 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3cf552edcd4f749711e9c4dcaf4a1ff9dc8977c;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  configure: correctly identify missing GNU compilers as such
  tests: get rid of ./defs, it's no longer used.
  maintcheck: fix the name of a check
  maintcheck: guard against uses of ./defs in tests

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

c3cf552edcd4f749711e9c4dcaf4a1ff9dc8977c
diff --cc syntax-checks.mk
index 7662d6fed,16320066b..c6d5521dd
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@@ -34,11 -34,9 +34,10 @@@ xtests := $(shell 
  xdefs = \
    $(srcdir)/t/ax/am-test-lib.sh \
    $(srcdir)/t/ax/test-lib.sh \
-   $(srcdir)/t/ax/test-defs.in \
-   $(srcdir)/defs
+   $(srcdir)/t/ax/test-defs.in
  
 -ams := $(shell find $(srcdir) -name '*.dir' -prune -o -name '*.am' -print)
 +ams := $(shell find $(srcdir) -name '*.dir' -prune -o -name '?*.am' -a -print)
 +pms := $(dist_perllib_DATA)
  
  # Some simple checks, and then ordinary check.  These are only really
  # guaranteed to work on my machine.
@@@ -59,26 -57,16 +58,27 @@@ sc_no_am_cd 
  sc_perl_at_uscore_in_scalar_context \
  sc_perl_local \
  sc_AMDEP_TRUE_in_automake_in \
 -sc_tests_make_without_am_makeflags \
 +sc_tests_no_gmake_requirement \
 +sc_tests_no_gmake_checking \
 +sc_tests_make_can_chain_suffix_rules \
 +sc_tests_make_dont_do_useless_vpath_rebuilds \
 +sc_no_dotmake_target \
 +sc_no_am_makeflags \
  $(sc_obsolete_requirements_rules) \
 +$(sc_renamed_variables_rules) \
 +$(sc_variable_typos_rules) \
 +sc_no_RECHECK_LOGS \
 +sc_tests_no_make_e \
 +sc_docs_no_make_e \
 +sc_make_simple_include \
 +sc_tests_make_simple_include \
+ sc_tests_no_source_defs \
  sc_tests_obsolete_variables \
  sc_tests_here_document_format \
  sc_tests_command_subst \
- sc_tests_Exit_not_exit \
+ sc_tests_exit_not_Exit \
  sc_tests_automake_fails \
  sc_tests_required_after_defs \
 -sc_tests_overriding_macros_on_cmdline \
  sc_tests_plain_sleep \
  sc_tests_ls_t \
  sc_tests_executable \