Merge branch 'maint' into branch-1.11

* maint:
  depcomp: add support for IBM xlc/xlC compilers

diff --cc NEWS
index 8570b10,ffb4cb7..4b19d89
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -25,40 -24,25 +25,43 @@@ New in 1.11.3a
      search path are looked up is probably going to be changed in the
      next Automake release (1.12).
  
 -  - The obsolescent AM_WITH_REGEX  macro has been deprecated (since the
 -    GNU rx library has been decommissioned), and will be removed in the
 -    next major Automake release (1.12).
 +  - The Automake support for automatic de-ANSI-fication will be removed
 +    in the next major Automake release (1.12).
  
 -* Changes to aclocal:
 +  - Starting from the next Automake release (1.12), warnings in the
 +    `extra-portability' category will be enabled by `-Wall' (right now,
 +    one has to use `-Wextra-portability' explicitly).
  
 -  - The `--acdir' option is deprecated.  Now you should use the new options
 -    `--automake-acdir' and `--system-acdir' instead.
 +* Miscellaneous changes:
  
 -  - The `ACLOCAL_PATH' environment variable is now interpreted as a
 -    colon-separated list of additional directories to search after the
 -    automake internal acdir (by default ${prefix}/share/aclocal-APIVERSION)
 -    and before the system acdir (by default ${prefix}/share/aclocal).
 +  - The 'ar-lib' script now ignores the "s" (symbol index) and "S" (no
 +    symbol index) modifiers as well as the "s" action, as the symbol index
 +    is created unconditionally by Microsoft lib.  Also, the "q" (quick)
 +    action is now a synonym for "r" (replace).  Also, the script has been
 +    ignoring the "v" (verbose) modifier already since Automake 1.11.3.
  
 -* Miscellaneous changes:
 +  - When the 'compile' script is used to wrap MSVC, it now accepts an
 +    optional space between the -I, -L and -l options and their respective
 +    arguments, for better POSIX compliance.
  
+   - Automatic dependency tracking now works also with the IBM XL C/C++
+     compilers, thanks to the new new depmode 'xlc'.
+ 
 +Bugs fixed in 1.11.3a:
 +
 +* Bugs introduced by 1.11.3:
 +
 +  - NONE YET
 +
 +* Long-standing bugs:
 +
 +  - NONE YET
 +
 +\f
 +New in 1.11.3:
 +
 +* Miscellaneous changes:
 +
    - Automake's own build system is more silent by default, making use of
      the 'silent-rules' option.
  

diff --cc lib/depcomp
index 2c30282,0122c04..58fe52c
--- 1/lib/depcomp
--- 2/lib/depcomp
+++ b/lib/depcomp
@@@ -100,14 -94,12 +100,20 @@@ if test "$depmode" = msvcmsys; the
     depmode=msvisualcpp
  fi
  
 +if test "$depmode" = msvc7msys; then
 +   # This is just like msvc7 but w/o cygpath translation.
 +   # Just convert the backslash-escaped backslashes to single forward
 +   # slashes to satisfy depend.m4
 +   cygpath_u='sed s,\\\\,/,g'
 +   depmode=msvc7
 +fi
 +
+ if test "$depmode" = xlc; then
+    # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+    gccflag=-qmakedep=gcc,-MF
+    depmode=gcc
+ fi
+ 
  case "$depmode" in
  gcc3)
  ## gcc 3 implements dependency tracking that does exactly what