Merge branch 'msvc'

* msvc:
  ar-lib: fix configure output for "unrecognized archiver interface"

diff --cc ChangeLog
index 2b83724,6a86113..443e15e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,13 +1,22 @@@
  2011-11-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
+       ar-lib: fix configure output for "unrecognized archiver interface"
+       * m4/ar-lib.m4: Ensure that, even when an error is hit while trying
+       to determine the archiver interface kind, the "checking archiver
+       interface" message from configure is properly terminated before
+       an error message is printed, to avoid slightly garbled output.
+       * tests/ar4.test: Enhance.
+       * tests/ar5.test: Likewise.
+ 
++2011-11-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
++
 +      Merge branch 'msvc' into master
 +      * tests/extra-portability3.test: Use `$original_AUTOMAKE' instead
 +      of hackishly extracting the first component of `$AUTOMAKE'.
 +      * tests/extra-portability.test: Likewise.  Also, since we are at
 +      it, throw in a couple of small extensions and tweakings (suggested
 +      by the minor merge conflicts).
 +
  2011-11-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        warnings: fix buglets for portability warnings