Merge branch 'maint'

* maint:
  tests: avoid spurious failures with older Texinfo
  tests: avoid tons of spurious failures on NetBSD
  runtest: avoid spurious failures on NetBSD
  news: dependency tracking for Portland Group Compilers is now supported

diff --combined NEWS
index 1f1955d,1d54541..59b86ea
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,34 -1,35 +1,34 @@@
 -New in 1.12.3:
 +New in 1.13:
  
 -* WARNING: Future backward-incompatibilities!
 +* Version requirements:
  
 -  - Future versions of Automake will likely drop support for the
 -    long-deprecated 'configure.in' name for the Autoconf input file.
 -    You are advised to use the recommended name 'configure.ac' instead.
 +  - Autoconf 2.65 or greater is required.
  
 -  - The long-obsolete (since automake 1.10) AM_PROG_MKDIR m4 macro will
 -    be removed in Automake 1.13.  The $(mkdir_p) make variable and the
 -    @mkdir_p@ substitution will still remain available (as aliases of
 -    $(MKDIR_P)) for the moment, for better backward compatibility.
 +  - The rules to build PDF and DVI output from Texinfo input now
 +    requires Texinfo 4.9 or later.
  
 -  - Autoconf 2.65 or later will be required by the next major Automake
 -    version (1.13).  Until now, Automake has required Autoconf version
 -    2.62 or later.
 +* Obsolete features removed:
  
 -  - Starting from the next major Automake version (1.13), the rules
 -    to build pdf, ps and dvi output from Texinfo input will use the
 -    '--build-dir' option by default.  Since such an option was only
 -    introduced in Texinfo 4.9, this means that Makefiles generated by
 -    future Automake versions will require at least that version of
 -    Texinfo.
 +  - Use of the long-deprecated two- and three-arguments invocation forms
 +    of the AM_INIT_AUTOMAKE is not supported anymore.
  
 -  - Starting from the next major Automake version (1.13), the parallel
 -    testsuite harness (previously only enabled by the 'parallel-tests'
 -    option) will become the default one; the older serial testsuite
 -    harness will still be available through the use of the 'serial-tests'
 -    option.
 +  - Support for the "Cygnus-style" trees (once enabled by the 'cygnus'
 +    option) has been removed.  See discussion about automake bug#11034
 +    for more background.
 +
 +  - The automake-provided '@mkdir_p@' configure substitution and
 +    AM_PROG_MKDIR m4 macro have been removed.  They had been obsolete
 +    since automake 1.10, and actively deprecated since Automake 1.12.1.
 +    However, to maintain a degree of backward-compatibility, the make
 +    variable '$(mkdir_p)' is still defined (now simple as an alias to
 +    '$(MKDIR_P)').  It will probably be removed in future major versions
 +    of Automake (probably 1.14).
  
 -  - The following long-obsolete m4 macros will be removed in the
 -    next major Automake version (1.13):
 +  - The deprecated aclocal option '--acdir' has been removed.  You
 +    should use the options '--automake-acdir' and '--system-acdir'
 +    instead (which have been introduced in Automake 1.11.2).
 +
 +  - The following long-obsolete m4 macros have been removed:
  
        AM_PROG_CC_STDC:    superseded by AC_PROG_CC since October 2002
        fp_PROG_CC_STDC:    broken alias for AM_PROG_CC_STDC
@@@ -42,127 -43,18 +42,127 @@@
                            of the now-removed automatic de-ANSI-fication
                            support of Automake)
  
 -  - All the "old alias" macros in 'm4/obsolete.m4' will be removed in
 -    the next major Automake version (1.13).
 +  - All the "old alias" macros in 'm4/obsolete.m4' have been removed.
 +
 +* Elisp byte-compilation:
 +
 +  - The byte compilation of '.el' files into '.elc' files is now done
 +    with a suffix rule.  This has simplified the compilation process, and
 +    more importantly made it less brittle.  The downside is that emacs is
 +    now invoked once for each '.el' files, which cause some noticeable
 +    slowdowns.  These should however be mitigated on multicore machines
 +    (which are becoming the norm today) if concurrent  make ("make -j")
 +    is used.
 +
 +  - Elisp files placed in a subdirectory are now byte-compiled to '.elc'
 +    files in the same subdirectory; for example, byte-compiling of file
 +    'sub/foo.el' file will result in 'sub/foo.elc' rather than in
 +    'foo.elc'.  This behaviour is backward-incompatible with older
 +    Automake versions, but it is more natural and more sane.  See also
 +    automake bug#7441.
 +
 +  - The Emacs invocation performing byte-compilation of '.el' files honors
 +    the $(AM_ELCFLAGS) and $(ELCFLAGS) variables; as typical, the former
 +    one is  developer-reserved and the latter one user-reserved.
 +
 +  - The 'elisp-comp' script, once provided by Automake, has been rendered
 +    obsoleted by the just-described changes, and thus removed.
 +
 +* Changes to Automake-generated testsuite harnesses:
 +
 +  - The parallel testsuite harness (previously only enabled by the
 +    'parallel-tests' option) is the default one; the older serial
 +    testsuite harness will still be available through the use of the
 +    'serial-tests' option (introduced in Automake 1.12).
 +
 +  - The 'color-tests' option is now unconditionally activated by default.
 +    In particular, this means that testsuite output is now colorized by
 +    default if the attached terminal seems to support ANSI escapes, and
 +    that the user can force output colorization by setting the variable
 +    AM_COLOR_TESTS to "always".  The 'color-tests' is still recognized
 +    for backward-compatibility, although it's a handled as a no-op now.
 +
 +* Silent rules support:
 +
 +  - Support for silent rules is now always active in Automake-generated
 +    Makefiles.  So, although the verbose output is still the default,
 +    the user can now always use "./configure --enable-silent-rules" or
 +    "make V=0" to enable quieter output in the package he's building.
 +
 +  - The 'silent-rules' option has now become a no-op, preserved for
 +    backward-compatibility only.  In particular, its use does not disable
 +    the warnings in the 'portability-recursive' category anymore.
 +
 +* Texinfo Support:
 +
 +  - The rules to build PDF and DVI files from Texinfo input now use the
 +    '--build-dir' option, to keep the auxiliary files used by texi2dvi
 +    and texi2pdf around without cluttering the build directory, and to
 +    make it possible to run the "dvi" and "pdf" recipes in parallel.
 +
 +* Automatic remake rules and 'missing' script:
 +
 +  - The 'missing' script does not try anymore to update the timestamp
 +    of out-of-date files that require a maintainer-specific tool to be
 +    remade, in case the user lacks such a tool (or has a too-old version
 +    of it).  It just give a useful warning, and in some cases also a tip
 +    about how to obtain such a tool.
 +
 +  - The missing script has thus become useless as a (poor) way to work
 +    around the sketched-timestamps issues that can happen for projects
 +    that keep generated files committed in their VCS repository.  Such
 +    projects are now encouraged to write a custom "fix-timestamps.sh"
 +    script to avoid such issues; a simple example is provided in the
 +    "CVS and generated files" chapter of the automake manual.
 +
 +* Recursive targets:
 +
 +  - The user can now define his own recursive targets that recurse
 +    in the directories specified in $(SUBDIRS).  This can be done by
 +    specifying the name of such targets in invocations of the new
 +    'AM_EXTRA_RECURSIVE_TARGETS' m4 macro.
 +
 +  - Any failure in the recipe of the "tags", "ctags", "cscope" or
 +    "cscopelist" targets in a subdirectory is now propagated to the
 +    top-level make invocation.
 +
 +* Improvements to aclocal and related rebuilds rules:
 +
 +  - The Autoconf-provided macro AC_CONFIG_MACRO_DIR is now traced by
 +    aclocal, and can be used to declare the local m4 include directory.
 +    Formerly, one had to specify it with an explicit '-I' option to the
 +    'aclocal' invocation.
 +
 +  - The special make variable ACLOCAL_AMFLAGS is deprecated; future
 +    Automake versions will warn about its use, and later version will
 +    remove support for it altogether.
 +
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +New in 1.12.3:
 +
 +* WARNING: Future backward-incompatibilities!
 +
 +  - Future versions of Automake will likely drop support for the
 +    long-deprecated 'configure.in' name for the Autoconf input file.
 +    You are advised to use the recommended name 'configure.ac' instead.
 +
 +  - Starting from the next major Automake version (1.13), the rules to
 +    build pdf, ps and dvi output from Texinfo input will use the '--tidy'
 +    option by default.  Since such an option was introduced in Texinfo
 +    4.9, this means that Makefiles generated by future Automake versions
 +    will require at least that version of Texinfo.
 +
 +  - Starting from the next major Automake version (1.13), the parallel
 +    testsuite harness (previously only enabled by the 'parallel-tests'
 +    option) will become the default one; the older serial testsuite
 +    harness will still be available through the use of the 'serial-tests'
 +    option.
  
    - Support for the two- and three-arguments invocation forms of the
      AM_INIT_AUTOMAKE macro is deprecated, and will be removed in the
      next major Automake version (1.13).
  
 -  - The '--acdir' option of aclocal is deprecated, and will probably
 -    be removed in the next major Automake release (1.13).  You should
 -    use the options '--automake-acdir' and '--system-acdir' instead
 -    (which have been introduced in Automake 1.11.2).
 -
    - The exact order in which the directories in the aclocal macro
      search path are looked up is probably going to be changed in the
      next Automake release (1.13).
@@@ -182,6 -74,9 +182,9 @@@
  
    - Some testsuite weaknesses and spurious failures have been fixed.
  
+   - There is initial support for automatic dependency tracking with the
+     Portland Group C/C++ compilers, thanks to the new new depmode 'pgcc'.
+ 
  Bugs fixed in 1.12.3:
  
  * Long-standing bugs:

diff --combined t/ax/am-test-lib.sh
index e2723f3,e69a904..d3351d2
--- 1/t/ax/am-test-lib.sh
--- 2/t/ax/am-test-lib.sh
+++ b/t/ax/am-test-lib.sh
@@@ -616,6 -616,13 +616,6 @@@ require_tool (
        makedepend -f- \
          || skip_all_ "required program 'makedepend' not available"
        ;;
 -    makeinfo-html)
 -      # Make sure we have makeinfo, and it understands '--html'.
 -      echo "$me: running makeinfo --html --version"
 -      makeinfo --html --version \
 -        || skip_all_ "cannot find a makeinfo program that groks" \
 -                     "the '--html' option"
 -      ;;
      mingw)
        uname_s=$(uname -s || echo UNKNOWN)
        echo "$me: system name: $uname_s"
@@@ -689,6 -696,12 +689,6 @@@
          skip_all_ "TeX is required, but it wasn't found by configure"
        fi
        ;;
 -    texi2dvi-o)
 -      # Texi2dvi supports '-o' since Texinfo 4.1.
 -      echo "$me: running texi2dvi -o /dev/null --version"
 -      texi2dvi -o /dev/null --version \
 -        || skip_all_ "required program 'texi2dvi' not available"
 -      ;;
      lex)
        test x"$LEX" = x"false" && skip_all_ "lex not found or disabled"
        export LEX
@@@ -727,7 -740,7 +727,7 @@@ process_requirements (
    for am_tool in $*; do
      require_tool $am_tool
    done
-   unset am_tool
+   am_tool=; unset am_tool
    # We might need extra macros, e.g., from Libtool or Gettext.
    case " $required " in
      *\ libtool*) . ./t/libtool-macros.dir/get.sh;;
@@@ -770,9 -783,9 +770,9 @@@ am_setup_testdir (
      {
        echo "AC_INIT([$me], [1.0])"
        if test x"$am_serial_tests" = x"yes"; then
 -        echo "AM_INIT_AUTOMAKE"
 +        echo "AM_INIT_AUTOMAKE([serial-tests])"
        else
 -        echo "AM_INIT_AUTOMAKE([parallel-tests])"
 +        echo "AM_INIT_AUTOMAKE"
        fi
        echo "AC_CONFIG_FILES([Makefile])"
      } >configure.ac || framework_failure_ "creating configure.ac skeleton"