From: Peter Rosin <peda@lysator.liu.se>
Date: Wed, 1 Feb 2012 15:28:48 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~11^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dde91c5484e045882198d656fcfda7e9c11d7858;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

dde91c5484e045882198d656fcfda7e9c11d7858
diff --cc tests/depcomp8a.test
index 2d9e80945,b94cf1ddb..222797da7
--- a/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 876f6aa1d,715d951c6..d4ee9c34b
--- a/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