Merge branch 'maint'

diff --cc tests/depcomp8a.test
index 2d9e8094552a6adfea50bd4c291beba68eb6c597,b94cf1ddb97d24c1cb8beb5da18232fca833d450..222797da76c51da7009e50122eaab5830f549228
--- 1/tests/depcomp8a.test
--- 2/tests/depcomp8a.test
+++ b/tests/depcomp8a.test
@@@ -19,11 -19,13 +19,12 @@@
  # Keep this in sync with sister test `depcomp8b.test', which checks the
  # same thing for libtool objects.
  
 +required=cc
  . ./defs || Exit 1
  
 -set -e
 -
  cat >> configure.in << 'END'
  AC_PROG_CC
+ #x AM_PROG_CC_C_O
  AC_OUTPUT
  END
  

diff --cc tests/depcomp8b.test
index 876f6aa1d0362e0aeb05bb7d29a46f99ad780dca,715d951c61a0bb703f4504f1efb17e38c71bee17..d4ee9c34bafc1f3efee45b6eb9b7919d1140339d
--- 1/tests/depcomp8b.test
--- 2/tests/depcomp8b.test
+++ b/tests/depcomp8b.test
@@@ -19,12 -19,14 +19,13 @@@
  # Keep this in sync with sister test `depcomp8a.test', which checks the
  # same thing for non-libtool objects.
  
 -required=libtoolize
 +required='cc libtoolize'
  . ./defs || Exit 1
  
 -set -e
 -
  cat >> configure.in << 'END'
  AC_PROG_CC
+ #x AM_PROG_CC_C_O
 +AM_PROG_AR
  AC_PROG_LIBTOOL
  AC_OUTPUT
  END