Merge branch 'master' into pr-msvc-support

diff --cc ChangeLog
Simple merge

diff --cc Makefile.am
index b30884b72c87087287c074b86213c47592071d2a,c49f7499a89ab3b999ae56c98c657fbe5b7db248..cdd6984d689916933c8cdbc3777c3fa2815bfd0f
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -500,9 -501,7 +503,9 @@@ EXTRA_DIST     += $(srcdir)/$(TESTSUITE
  TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
        CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
        LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
-       STRIP="$(STRIP)" INSTALL="$(INSTALL)" \
 +      AR="$(AR)" AR_FLAGS="$(AR_FLAGS)" \
 +      LT_AR="$(LT_AR)" LT_ARFLAGS="$(LT_ARFLAGS)" \
+       STRIP="$(STRIP)" lt_INSTALL="$(INSTALL)" \
        OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" \
        SHELL="$(SHELL)" CONFIG_SHELL="$(SHELL)" \
        CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CXXCPP="$(CXXCPP)" \

diff --cc NEWS
Simple merge

diff --cc doc/libtool.texi
Simple merge

diff --cc libltdl/config/ltmain.m4sh
Simple merge

diff --cc libltdl/m4/libtool.m4
Simple merge