Merge branch 'master' into ng/master

* master: (21 commits)
  news: document deprecation of configure.in
  news: put planned backward compatibilities early
  sync: update files from upstream with "make fetch"
  maint: deprecate 'configure.in' as autoconf input
  maint: post-release minor version bump
  release: stable release 1.12.1
  copyright: update copyright years in a couple of files
  tests: avoid spurious failures with Solaris 9 cscope program
  maintcheck: fix a spurious failure
  perf: beginning of a performance testsuite
  aclocal: declare function prototypes, do not use '&' in function calls
  news: support for configure.in will be dropped in future automake versions
  missing: support AC_CONFIG_HEADERS in addition to obsolete AC_CONFIG_HEADER
  missing: don't bother checking for AM_CONFIG_HEADER: it is gone now
  docs: remove mention of AM_CONFIG_HEADER: it is obsolete and removed now
  tests: fix botched heading comments in 'lex-clean-cxx.sh'
  [ng] maintcheck: some tweaks and fixlets
  help: fix a typo in the list of warning categories
  maint: version bump after beta release
  release: beta release 1.12.0b (will become 1.12.1)
  ...

+ Extra non-trivial edits:

* Makefile.am (TESTS): Add the tests in the 't/perf' directory.

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

diff --cc .gitignore
Simple merge

diff --cc Makefile.am
index c7b7686586234deae180c1b17245ca7f71ac611e,e581cf20f8b6fed6c87d43d43d866b20bffda1c8..4f95e11bf479c58749e2fff63db8edf9be5282c4
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -293,63 -324,7 +293,64 @@@ AM_TAP_LOG_DRIVER_FLAGS = --merg
  
  EXTRA_DIST += t/README t/ax/is
  
 -TESTS = ## Will be updated later.
 +# All tests, both hand-written and autogenerated.
 +# IMPORTANT: This assumes that the autogenerated tests are placed
 +#            in the $(srcdir) as well!
 +all_TESTS = \
 +  $(wildcard $(srcdir)/t/*.sh) \
 +  $(wildcard $(srcdir)/t/*.tap) \
-   $(wildcard $(srcdir)/t/pm/*.pl)
++  $(wildcard $(srcdir)/t/pm/*.pl) \
++  $(wildcard $(srcdir)/t/perf/*.sh)
 +
 +# This is to ensure longer-running tests will be run earlier, which is
 +# useful when running the testsuite in parallel on multicore machines.
 +# Here too we assume that the autogenerated tests are placed in $(srcdir).
 +long_running_TESTS = \
 +  $(srcdir)/t/add-missing.tap \
 +  $(srcdir)/t/instspc.tap \
 +  $(wildcard $(srcdir)/t/depcomp-*.tap) \
 +  $(wildcard $(srcdir)/t/*libtool*.sh) \
 +  $(wildcard $(srcdir)/t/lt*.sh) \
 +  $(wildcard $(srcdir)/t/remake*.sh)
 +
 +TESTS = \
 +  $(long_running_TESTS) \
 +  $(filter-out $(long_running_TESTS), $(all_TESTS))
 +
 +EXTRA_DIST += $(TESTS)
 +
 +# FIXME: this "expected failures" are in truth an hack used to
 +# FIXME: to verify that some incorrect usages of our perl libraries
 +# FIXME: raise an error.  We should find a cleaner way to check that.
 +perl_fake_XFAIL_TESTS = \
 +  t/pm/Cond2.pl \
 +  t/pm/Cond3.pl \
 +  t/pm/DisjCon2.pl \
 +  t/pm/DisjCon3.pl \
 +  t/pm/Version2.pl \
 +  t/pm/Version3.pl
 +
 +XFAIL_TESTS = \
 +  t/all.sh \
 +  t/yacc-bison-skeleton-cxx.sh \
 +  t/yacc-bison-skeleton.sh \
 +  t/comments-in-var-def.sh \
 +  t/cond17.sh \
 +  t/dist-srcdir2.sh \
 +  t/gcj6.sh \
 +  t/override-conditional-2.sh \
 +  t/dist-pr109765.sh \
 +  t/instdir-cond2.sh \
 +  t/interp3.sh \
 +  t/java-nobase.sh \
 +  t/objext-pr10128.sh \
 +  t/parallel-tests-many.sh \
 +  t/pr8365-remake-timing.sh \
 +  t/remake-am-pr10111.sh \
 +  t/remake-m4-pr10111.sh \
 +  t/txinfo5.sh \
 +  t/var-undef-append.sh \
 +  $(perl_fake_XFAIL_TESTS)
  
  # Some testsuite-influential variables should be overridable from the
  # test scripts, but not from the environment.

diff --cc aclocal.in
Simple merge

diff --cc defs
Simple merge

diff --cc doc/automake-ng.texi
Simple merge

diff --cc lib/Automake/ChannelDefs.pm
Simple merge

diff --cc lib/missing
index 6b4153ef4c8fd068b503604e127c427c0c13a3ca,074c62c4488650d623d30336ac7c528216da303c..be44a62b132a4dac64e39f97a1f601a9cf9f3b31
--- 1/lib/missing
--- 2/lib/missing
+++ b/lib/missing
@@@ -1,7 -1,7 +1,7 @@@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
  
- scriptversion=2012-05-20.14; # UTC
 -scriptversion=2012-05-23.18; # UTC
++scriptversion=2012-06-02.10; # UTC
  
  # Copyright (C) 1996-2012 Free Software Foundation, Inc.
  # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.

diff --cc syntax-checks.mk
Simple merge

diff --cc t/cscope.tap
Simple merge