Merge branch 'msvc'

* msvc:
  Add new auxiliary 'ar-lib' script, wrapping Microsoft lib.
  Fix shell pattern negation in compile script.

diff --cc ChangeLog
index 88d2cfcd9ff0ad0d8b5e6fcc0d5195f6e61669a5,8208906c2504d42e50e4a5b0bc5cf05d1a4e6072..e2de1ad55d6a251f67ac6de162f26cf2c06ea118
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,26 -1,22 +1,45 @@@
+ 2010-08-06  Peter Rosin  <peda@lysator.liu.se>
+ 
+       Add new auxiliary 'ar-lib' script, wrapping Microsoft lib.
+       * lib/ar-lib: New auxiliary script.
+       * lib/Makefile.am: Add above.
+       * tests/ar-lib.test: New test.
+       * tests/Makefile.am: Add above.
+       * automake.in (@common_files): Distribute the 'ar-lib' script.
+       * doc/automake.texi (Auxiliary Programs): Mention the new
+       'ar-lib' script.
+       (Optional): Mention 'ar-lib' in AC_CONFIG_AUX_DIR.
+       * NEWS: Update.
+ 
+ 2010-08-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       Fix shell pattern negation in compile script.
+       * lib/compile (func_file_conv): Use `!' not `^' for pattern
+       negation.
+ 
 +2010-08-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Fix maintainer-check failure.
 +      * tests/cond5.test: Quote sleep argument, this isn't about
 +      time stamp differences.
 +
 +      Sync auxiliary files from upstream.
 +      * lib/config.guess, lib/config.sub, lib/texinfo.tex:
 +      Sync from upstream.
 +
 +2010-08-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Work around a nasty bug (segfault) of Solaris make.
 +      * lib/am/check.am (recheck, recheck-html): Trim trailing spaces
 +      from $list, to avoid triggering a nasty bug (potential segfault)
 +      on Solaris make.
 +
 +2010-08-06  Peter Rosin  <peda@lysator.liu.se>
 +
 +      Make cond5.test more robust on MSYS.
 +      * tests/cond5.test: Add delay before the first kill attempt to
 +      cater for problems with MSYS bash.
 +
  2010-08-01  Peter Rosin  <peda@lysator.liu.se>
  
        Wrap some MSVC options in the compile script.

diff --cc NEWS
index 19e45484e8de2c8b25f8e1809cb20f9b650d44bd,6971bd73c32be665b8442119aa01cc1e433981cd..c0f3ebd98fe69da0cea8618d02197d9423c9cfa0
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -15,17 -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.
  
 +  - "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.
+     user experience.  Similarly, the new `ar-lib' script wraps Microsoft lib.
  
 -Bugs fixed in 1.11.0a:
 +Bugs fixed in 1.11a:
 +
 +  - Lots of minor bugfixes.
  
  * Bugs introduced by 1.11:
  

diff --cc automake.in
index 97280a913e868ca09a93dd8382c4ac7a92e2fe4c,8fd68696eb74413a4babfd2186d2f4f183fe4e2f..c0c5289130d8c623f648f503909371cbfebda2b7
mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in

diff --cc doc/automake.texi
Simple merge

diff --cc lib/Makefile.in
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge