Merge branch 'maint'

diff --cc ChangeLog
index 03662c1,15b6a86..8f306ee
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,30 -1,8 +1,35 @@@
+ 2010-08-16  Bruno Haible  <bruno@clisp.org>
+ 
+       Don't hide the table of contents.
+       * doc/automake.texi: Move the table of contents to the beginning.
+ 
 +2010-08-16  Peter Rosin  <peda@lysator.liu.se>
 +
 +      Optimize compile script on MSYS.
 +      * lib/compile (func_file_conv): Add new argument 'lazy' which
 +      takes an optional list of conversion types where the requested
 +      conversion isn't needed.
 +      (func_cl_wrapper): Take advantage of the above for cases where
 +      MSYS is doing the conversion for us.
 +      Suggested by Ralf Wildenhues.
 +
 +2010-08-16  Peter Rosin  <peda@lysator.liu.se>
 +
 +      Support more C++ file extensions for MSVC in the compile script.
 +      * lib/compile (func_cl_wrapper): MSVC only recognizes the .cpp
 +      file extension as C++, unless it's given a hint. So hint about
 +      .cc, .CC, .cxx, .CXX, c++ and C++. Also do path conversion on
 +      .c, .cpp, .CPP, .lib, .LIB and .Lib files.
 +      * lib/compile3.test: Test the C++ hinting.
 +
 +2010-08-12  Peter Rosin  <peda@lysator.liu.se>
 +
 +      Enable the use of "link -lib" as the wrapped archiver.
 +      * lib/ar-lib: Enable the use of "link -lib" as the wrapped
 +      archiver, as well as allowing some other options to be passed
 +      through to the wrapped archiver.
 +      * tests/ar-lib.test: Test the above.
 +
  2010-08-10  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        Tweak and/or extend some `acloca*.test' tests.

diff --cc doc/automake.texi
Simple merge