Merge branch 'tests-canon-fixes'

diff --cc ChangeLog
index c238614f35fbb2ed7ea7ba13193ee2ebfedac0b1,cb8c2073b8a0042a61d086ea0652430b0304ec9d..0c5ce7ef804b5fd0c54a30b95ad52c4cc02fd520
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,9 +1,15 @@@
+ 2010-12-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Minor cleanups in canon7.test.
+       * tests/canon7.test (_foo_bar_SOURCES): Remove libs.c.
+       (configure.in): Remove AC_PROG_CXX.
+ 
 +2010-12-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Avoid false positive in sc_tests_plain_make maintainer-check.
 +      * Makefile.am (sc_tests_plain_make): Ensure to only match full
 +      `make' words.  Avoid false positive with remake11.test.
 +
  2010-12-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
        Fix canon7.test failure.