Merge branch 'micro' into maint

* micro:
  t/README: document "run_make", discourage "make -e"
  cosmetics: tiny whitespace fixlets
  tests: avoid a spurious failure with MSVC
  tests: avoid a spurious failure on non-POSIX systems

diff --combined maintainer/maint.mk
index baa8381,3071360..3fe6cce
--- 1/maintainer/maint.mk
--- 2/maint.mk
+++ b/maintainer/maint.mk
@@@ -456,17 -456,11 +456,17 @@@ files_without_copyright += lib/mkinstal
  # This script has an MIT-style license
  files_without_copyright += lib/install-sh
  
 +# The UPDATE_COPYRIGHT_YEAR environment variable is honoured by the
 +# 'lib/update-copyright' script.
  .PHONY: update-copyright
  update-copyright:
        $(AM_V_GEN)set -e; \
 -      current_year=`date +%Y` && test -n "$$current_year" \
 -        || { echo "$@: cannot get current year" >&2; exit 1; }; \
 +      if test -n "$$UPDATE_COPYRIGHT_YEAR"; then \
 +         current_year=$$UPDATE_COPYRIGHT_YEAR; \
 +      else \
 +        current_year=`date +%Y` && test -n "$$current_year" \
 +          || { echo "$@: cannot get current year" >&2; exit 1; }; \
 +      fi; \
        sed -i "/^RELEASE_YEAR=/s/=.*$$/=$$current_year/" \
          bootstrap.sh configure.ac; \
        excluded_re=`( \
@@@ -476,7 -470,6 +476,7 @@@
        ) | sed -e '$$!s,$$,|,' | tr -d '\012\015'`; \
        $(GIT) ls-files \
          | grep -Ev '(^|/)README$$' \
 +        | grep -Ev '^PLANS(/|$$)' \
          | grep -Ev "^($$excluded_re)$$" \
          | $(update_copyright_env) xargs $(srcdir)/lib/$@
  
@@@ -557,7 -550,7 +557,7 @@@ check-minimal-autoconf
  
  #
  # NOTE (from Stefano Lattarini):
- # 
+ #
  # This section is mostly hacky and ad-hoc, but works for me and
  # on my system.  And while far from clean, it should help catching
  # real regressions on real world packages, which is important.

diff --combined t/ax/am-test-lib.sh
index 1ce3b7d,351db13..182b070
--- 1/t/ax/am-test-lib.sh
--- 2/t/ax/am-test-lib.sh
+++ b/t/ax/am-test-lib.sh
@@@ -398,7 -398,6 +398,6 @@@ grep_configure_help (
    $EGREP "$2" am--our-help || exit 1
  }
  
- 
  # using_gmake
  # -----------
  # Return success if $MAKE is GNU make, return failure otherwise.
@@@ -509,7 -508,6 +508,6 @@@ am__useless_vpath_rebuild="
  
  yl_distcheck () { useless_vpath_rebuild || run_make distcheck ${1+"$@"}; }
  
- 
  null_install ()
  {
    for am__v in nulldirs destdir instdir; do
@@@ -763,11 -761,6 +761,11 @@@ require_tool (
    case $1 in
      cc|c++|fortran|fortran77)
        require_compiler_ $1;;
 +    -c-o)
 +      if test x"$AM_TESTSUITE_SIMULATING_NO_CC_C_O" = x"yes"; then
 +        skip_all_ "need a C compiler that grasps -c and -o together"
 +      fi
 +      ;;
      xsi-lib-shell)
        if test x"$am_test_prefer_config_shell" = x"yes"; then
          require_xsi "$SHELL"
@@@ -1038,7 -1031,7 +1036,7 @@@ am_setup_testdir (
      || framework_failure_ "cannot chdir into test subdirectory"
    if test x"$am_create_testdir" != x"empty"; then
      cp "$am_scriptdir"/install-sh "$am_scriptdir"/missing \
 -       "$am_scriptdir"/depcomp . \
 +       "$am_scriptdir"/compile "$am_scriptdir"/depcomp . \
        || framework_failure_ "fetching common files from $am_scriptdir"
      # Build appropriate environment in test directory.  E.g., create
      # configure.ac, touch all necessary files, etc.  Don't use AC_OUTPUT,