Merge branch 'msvc'

diff --cc ChangeLog
index de880cbd0075b0be179b81f7ce185b3faeb4a3b6,ad402d058ffdcdc23ca7698d343e57d9cb287bc2..2bc75c873e6b0c19020498db0691b4b57e362e8b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,49 -1,12 +1,58 @@@
+ 2010-10-07  Peter Rosin  <peda@lysator.liu.se>
+ 
+       depcomp: add new one-pass depmode for MSVC 7 and later.
+       * lib/depcomp: Add new depmodes 'msvc7' and 'msvc7msys' which
+       make use of the -showIncludes option added in MSVC 7.
+       * m4/depend.m4 (_AM_DEPENDENCIES): Handle the new depmodes
+       similarly to 'msvisualcpp' and 'msvcmsys' as MSVC does not
+       support the -o option.
+ 
 +2010-10-05  Jim Meyering  <meyering@redhat.com>
 +
 +      dist-xz, dist-bzip2: don't hard-code -9: honor envvar settings
 +      * lib/am/distdir.am (dist-xz): Do not hard-code xz's -9: that
 +      made it impossible to override.  Instead, use its XZ_OPT envvar,
 +      defaulting to -9 if not defined.  Thus no change in behavior
 +      when XZ_OPT is not set, and now, this rule honors the setting
 +      of that envvar when it is set.  Suggested by Lasse Collin.
 +      (dist-bzip2): Likewise for it's corresponding envvar: BZIP2.
 +      * NEWS (Miscellaneous changes): Mention it.
 +      * doc/automake.texi (The Types of Distributions): Describe the
 +      newly enabled environment variables.
 +
 +2010-10-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Add support for newer python versions.
 +      * m4/python.m4 (AM_PATH_PYTHON): Add python2.7 and python3.2 to
 +      _AM_PYTHON_INTERPRETER_LIST.  Since we are at it, break a long
 +      line and fix indentation.
 +      * THANKS: Updated.
 +      From a report by Thomas Klausner.
 +
 +      Add test for `AM_WITH_DMALLOC' macro.
 +      * tests/dmalloc.test: New test.
 +      * tests/Makefile.am (TESTS): Update.
 +
 +      Fix nits and bugs in tests `help*.test'.
 +      * tests/help4.test: Fix broken sed commands used to strip `-W...'
 +      flags away from "$AUTOMAKE" and "$ACLOCAL".
 +      * tests/help3.test: Likewise, and fix a botched comment.
 +      * tests/help.test: Likewise.  Also, use "AUTOMAKE_fails ..."
 +      instead of "$AUTOMAKE ... && Exit 1", for consistency and to
 +      please maintainet-check.
 +      * tests/help2.test: Likewise.
 +
 +2010-10-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +          Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Improve tests `help*.test' (also fixes maintcheck failures).
 +      * tests/help.test: To run automake, use `$AUTOMAKE' with all `-W'
 +      flags stripped away rather than hard-coded `automake-$APIVERSION',
 +      to better honour user-overrides.  Similarly for aclocal.
 +      * tests/help2.test: Likewise.
 +      * tests/help3.test: Likewise.
 +      * tests/help4.test: Likewise.
 +
  2010-10-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
        tests: fix ar-lib.test for echo that interprets backslashes.