Merge branch 'maint'

diff --cc ChangeLog
index 36be6379f05118129d03007c2ac7f422190c515c,9444b66f8e9d8c8fe633156462f7414c32c66cf0..6b1b6db8ea3980206aa1fc4b3666bddd8ec679ea
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,19 +1,21 @@@
+ 2010-09-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Make some `confh*.test' tests more "semantic" (plus tweakings).
+       * tests/confh.test: Run "autoconf", "configure" and "make check",
+       instead of munging/grepping the generated `Makefile.in'.
+       * tests/confh4.test: Relax the grepping of Makefile.in w.r.t.
+       white spaces.  Do not create usless dummy source file `foo.c'
+       and useless dummy header file `acconfig.h'.
+       (configure.in): Remove superfluous call to `AC_OUTPUT'.
+       * tests/confh6.test: Add trailing `:' command.
+       * tests/confh7.test: In comments, add reference to ...
+       * tests/confh8.test: ... this new test, "semantic" sister
+       of `confh7.test'.
+       * tests/Makefile.am (TESTS): Updated.
+       Prompted by a report from Ralf Wildenhues.
+ 
 +2010-09-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
        Remove useless whitespace padding in XFAIL_TESTS definition.
        * tests/Makefile.am (XFAIL_TESTS): Remove whitespace padding.
  

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
index e6c1063ba5e5b63a8b08cb90267b82804d581b88,e967caae78a1222b34ac84799205801c72b814e1..d64b7acb3521c8f35b39c9adca4a351a9534f057
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -251,18 -244,35 +251,18 @@@ top_build_prefix = @top_build_prefix
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  XFAIL_TESTS = \
- all.test                                      \
- auxdir2.test                                  \
- cond17.test                                   \
- gcj6.test                                     \
+ all.test \
+ auxdir2.test \
+ cond17.test \
+ gcj6.test \
  txinfo5.test
  
 -parallel_tests = \
 -check-p.test \
 -check10-p.test \
 -check11-p.test \
 -check2-p.test \
 -check3-p.test \
 -check4-p.test \
 -check5-p.test \
 -check6-p.test \
 -check7-p.test \
 -check8-p.test \
 -check9-p.test \
 -color-p.test \
 -color2-p.test \
 -comment9-p.test \
 -dejagnu-p.test \
 -exeext4-p.test \
 -maken3-p.test \
 -maken4-p.test \
 -pr401-p.test \
 -pr401b-p.test \
 -pr401c-p.test
 -
 +parallel_tests = check-p.test check10-p.test check11-p.test \
 +      check2-p.test check3-p.test check4-p.test check5-p.test \
 +      check6-p.test check7-p.test check8-p.test check9-p.test \
 +      color-p.test color2-p.test comment9-p.test dejagnu-p.test \
 +      exeext4-p.test maken3-p.test maken4-p.test pr401-p.test \
 +      pr401b-p.test pr401c-p.test
  MAINTAINERCLEANFILES = $(parallel_tests)
  TESTS = \
  aclibobj.test \