Merge branch 'msvc'

* msvc:
  Wrap some MSVC options in the compile script.

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index 1c1990923e3b4d9be49ad717b8901b2590d48ddc,54fac91d35c47380a36cfa4e8453ad63caee71c7..19e45484e8de2c8b25f8e1809cb20f9b650d44bd
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -15,14 -5,10 +15,17 @@@ New in 1.11a
    - The `lzma' compression scheme and associated automake option `dist-lzma'
      is obsoleted by `xz' and `dist-xz' due to upstream changes.
  
 -Bugs fixed in 1.11.0a:
 +  - "make dist" can now create lzip-compressed tarballs.
 +
 +  - Messages of types warning or error from `automake' and `aclocal' are now
 +    prefixed with the respective type, and presence of -Werror is noted.
 +
+   - The `compile' script now converts some options for MSVC for a better
+     user experience.
+ 
 +Bugs fixed in 1.11a:
 +
 +  - Lots of minor bugfixes.
  
  * Bugs introduced by 1.11:
  

diff --cc doc/automake.texi
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge

diff --cc tests/defs.in
Simple merge