Merge branch 'maint'

diff --cc ChangeLog
index 50b86335e47a4f5f29195d762708e0b6c7b4ff36,a05e69040dd2068337fb32ac6ed665617ff6b59b..8cb078ae9a86773e28097ae596db2d68ce725312
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,11 +1,21 @@@
+ 2011-06-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       maintcheck: extend 'sc_tests_plain_*' checks
+       * Makefile.am (sc_tests_plain_autom4te): New check.
+       (sc_tests_plain_autoreconf): Likewise.
+       (sc_tests_plain_autoheader): Likewise.
+       (syntax_check_rules): Update.
+ 
 +2011-06-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: interactions between TESTS_ENVIRONMENT and LOG_COMPILER
 +      * tests/tests-environment-and-log-compiler.test: New test,
 +      checking that we can use variables and functions set by
 +      TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT in LOG_COMPILER
 +      and LOG_FLAGS (for tests both with and without registered
 +      extensions).
 +      * tests/Makefile.am (TESTS): Update.
 +
  2011-06-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        maintcheck: avoid few spurious failures

diff --cc Makefile.am
Simple merge

diff --cc Makefile.in
Simple merge