Merge branch 'maint'

diff --cc ChangeLog
index 266b1dedfc20b11bcee3791845e254d5d4d46020,ffbeb692dfd15c591598706a54ddc910327f8b06..52291deb12e17b8a22c21a155f5ca175c5b46685
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,28 -1,69 +1,94 @@@
+ 2010-11-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Tests: consistently use "|| Exit 1" after ". ./defs".
+       * tests/autohdr.test: Use `. ./defs || Exit 1', not bare
+       `. ./defs', for consistency with other tests.
+       * tests/autohdr2.test: Likewise.
+       * tests/autohdr3.test: Likewise.
+       * tests/autohdr4.test: Likewise.
+       * tests/cond23.test: Likewise.
+       * tests/cond24.test: Likewise.
+       * tests/cond25.test: Likewise.
+       * tests/cond26.test: Likewise.
+       * tests/cond27.test: Likewise.
+       * tests/cond28.test: Likewise.
+       * tests/cond29.test: Likewise.
+       * tests/cond30.test: Likewise.
+       * tests/cond31.test: Likewise.
+       * tests/cond32.test: Likewise.
+       * tests/cond33.test: Likewise.
+       * tests/cond34.test: Likewise.
+       * tests/cond35.test: Likewise.
+       * tests/cond36.test: Likewise.
+       * tests/cond37.test: Likewise.
+       * tests/cond38.test: Likewise.
+       * tests/cond39.test: Likewise.
+       * tests/cond40.test: Likewise.
+       * tests/cond41.test: Likewise.
+       * tests/cond42.test: Likewise.
+       * tests/cond43.test: Likewise.
+       * tests/cond44.test: Likewise.
+       * tests/cond45.test: Likewise.
+       * tests/dollarvar.test: Likewise.
+       * tests/dollarvar2.test: Likewise.
+       * tests/hfs.test: Likewise.
+       * tests/libobj14.test: Likewise.
+       * tests/percent.test: Likewise.
+       * tests/percent2.test: Likewise.
+       * tests/phony.test: Likewise.
+       * tests/silent.test: Likewise.
+       * tests/silent2.test: Likewise.
+       * tests/silent3.test: Likewise.
+       * tests/silent4.test: Likewise.
+       * tests/silent5.test: Likewise.
+       * tests/silent6.test: Likewise.
+       * tests/silent7.test: Likewise.
+       * tests/silent9.test: Likewise.
+       * tests/silentcxx.test: Likewise.
+       * tests/silentf77.test: Likewise.
+       * tests/silentf90.test: Likewise.
+       * tests/silentlex.test: Likewise.
+       * tests/silentyacc.test: Likewise.
+ 
+       Avoid useless cleaning in some `silent*.test' tests.
+       * tests/silentf77.test: Removed useless calls to "make clean"
+       and "make maintainer-clean".
+       * tests/silentf90.test: Likewise.
+       * tests/silent3.test: Removed useless call to "make distclean".
+       * tests/silent4.test: Likewise.
+       * tests/silent9.test: Likewise.
+ 
+ 2010-11-19  Ian Lance Taylor  <iant@google.com>
+ 
+       Sync config-ml.in from GCC.
+       * config-ml.in: Add Go support: treat GOC and GOCFLAGS like other
+       compiler/flag environment variables.
+ 
 +2010-11-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      release-stats: account for more generated tests.
 +      * Makefile.am (release-stats): Be sure to take into account all
 +      the generated tests, by grepping the test scripts to decide which
 +      ones of them are automatically generated.
 +
 +2010-11-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Code cleanup after removal of option `--output-directory'.
 +      * automake.in ($output_directory): Remove, it's unconditionally
 +      defined to `.' and used only ...
 +      (generate_makefile): ... in this subroutine, which now has been
 +      edited and simplified accordingly.
 +
 +      Remove obsolete automake option `--output-directory'.
 +      This option has been deprecated since version 1.7 (2002/2003).
 +      * automake.in ($output_directory): Define to `.' unconditionally.
 +      (parse_arguments): Remove handling of equivalent options `-o' and
 +      `--output-directory'.
 +      * tests/outdir.test: Removed.
 +      * tests/no-outdir-option.test: New test.
 +      * tests/Makefile.am (TESTS): Updated.
 +      * NEWS: Updated.
 +
  2010-11-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        Automake::Config: remove extra trailing semicolon.