Merge branch 'msvc' into master

Commits merged from msvc:
 - tests: few improvements to some `ar-lib' related tests
 - warnings: new 'extra-portability' category, for AM_PROG_AR
 - ar-lib: new 'AM_PROG_AR' macro, triggering the 'ar-lib' script

Extra changes required by the testsuite:
* tests/instspc-tests.sh: Adjust to new portability requirements
due to the new AM_PROG_AR macro.
* tests/libobj-basic.test: Likewise.
* tests/libobj2.test: Likewise.
* tests/libobj15a.test: Likewise.
* tests/libobj15b.test: Likewise.
* tests/libobj15c.test: Likewise.
* tests/libobj16a.test: Likewise.
* tests/libobj16b.test: Likewise.
* tests/libobj17.test: Likewise.
* tests/libobj18.test: Likewise.
* tests/libobj19.test: Likewise.
* tests/libobj20a.test: Likewise.
* tests/libobj20b.test: Likewise.
* tests/libobj20c.test: Likewise.
* tests/canon6.test: Likewise.
* tests/canon6.test: Likewise.
* tests/canon7.tests: Likewise.
* tests/extra9.test: Likewise.
* tests/extradep.test: Likewise.
* tests/extradep2.test: Likewise.
* tests/posixsubst-ldadd.test: Likewise.
* tests/posixsubst-libraries.test: Likewise.
* tests/posixsubst-ltlibraries.test: Likewise.
* tests/python-virtualenv.test: Likewise.
* tests/vartypos.test: Likewise.
* tests/vartypo2.test: Likewise.
* tests/suffix.test: Update to take into account previous
master-only changes.
* tests/suffix2.test: Likewise.
* tests/libobj7.test: Call automake with the `--add-missing'
option, instead of creating a dummy `ar-lib' file, since this
test now also runs "./configure" and "make".
* tests/suffix5.test: Copy the real `ar-lib' script file,
instead of creating a dummy one, since this test now also
runs "./configure" and "make".
* tests/extra-portability2.test: Fix this test not to rely
on the older, faulty semantics of "strictness specification
always reset warning level", which has been fixed in commit
v1.11-623-g1609491 (see also automake bug#7669 a.k.a. PR/547).
Since we are at it, throw inf few other minor unrelated
improvements.
* tests/extra-portability.test: Explicitly pass `-Wall' to
automake calls, for clarity.

1 files changed, 22 insertions, 0 deletions

diff --git a/automake.in b/automake.in
index cbbdd5308..0b6d014f4 100644
--- a/automake.in
+++ b/automake.in
@@ -389,6 +389,9 @@ my $package_version_location;
 # TRUE if we've seen AM_ENABLE_MULTILIB.
 my $seen_multilib = 0;
 
+# TRUE if we've seen AM_PROG_AR
+my $seen_ar = 0;
+
 # TRUE if we've seen AM_PROG_CC_C_O
 my $seen_cc_c_o = 0;
 
@@ -2652,6 +2655,13 @@ sub handle_libraries
 	      &check_libobjs_sources ($xlib, $xlib . '_LIBADD');
 	    }
 	}
+
+      if (! $seen_ar)
+	{
+	  msg ('extra-portability', $where,
+	       "`$onelib': linking libraries using a non-POSIX\n"
+	       . "archiver requires `AM_PROG_AR' in `$configure_ac'")
+	}
     }
 }
 
@@ -2891,6 +2901,13 @@ sub handle_ltlibraries
 	      &check_libobjs_sources ($xlib, $xlib . '_LIBADD');
 	    }
 	}
+
+      if (! $seen_ar)
+	{
+	  msg ('extra-portability', $where,
+	       "`$onelib': linking libtool libraries using a non-POSIX\n"
+	       . "archiver requires `AM_PROG_AR' in `$configure_ac'")
+	}
     }
 }
 
@@ -5168,6 +5185,7 @@ sub scan_autoconf_traces ($)
 		AM_GNU_GETTEXT_INTL_SUBDIR => 0,
 		AM_INIT_AUTOMAKE => 0,
 		AM_MAINTAINER_MODE => 0,
+		AM_PROG_AR => 0,
 		AM_PROG_CC_C_O => 0,
 		AM_SILENT_RULES => 0,
 		_AM_SUBST_NOTMAKE => 1,
@@ -5357,6 +5375,10 @@ sub scan_autoconf_traces ($)
 	{
 	  $seen_maint_mode = $where;
 	}
+      elsif ($macro eq 'AM_PROG_AR')
+	{
+	  $seen_ar = $where;
+	}
       elsif ($macro eq 'AM_PROG_CC_C_O')
 	{
 	  $seen_cc_c_o = $where;