[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1814-gdde91c5

[Peter Rosin]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=dde91c5484e045882198d656fcfda7e9c11d7858

The branch, master has been updated
       via  dde91c5484e045882198d656fcfda7e9c11d7858 (commit)
       via  85cadc4e7738b84cc107b2f7a2adad5a2fa29005 (commit)
       via  c3e4962a9819b260a61e156f2105b58558af6396 (commit)
      from  3c66523fe55c94b19b5b26e0eae1c8de1d47d0cd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dde91c5484e045882198d656fcfda7e9c11d7858
Merge: 3c66523 85cadc4
Author: Peter Rosin <address@hidden>
Date:   Wed Feb 1 16:28:48 2012 +0100

    Merge branch 'maint'

-----------------------------------------------------------------------

Summary of changes:
 tests/depcomp8a.test |    4 +++-
 tests/depcomp8b.test |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
 delete mode 100644 lib/am/comp-vars.am

diff --git a/lib/am/comp-vars.am b/lib/am/comp-vars.am
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/depcomp8a.test b/tests/depcomp8a.test
index 2d9e809..222797d 100755
--- a/tests/depcomp8a.test
+++ b/tests/depcomp8a.test
@@ -24,6 +24,7 @@ required=cc
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+#x AM_PROG_CC_C_O
 AC_OUTPUT
 END
 
@@ -60,7 +61,8 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' 
$MAKE distcheck
 
 # Try again with subdir-objects option.
 
-echo AM_PROG_CC_C_O >> configure.in
+sed 's/#x //' configure.in >configure.int
+mv -f configure.int configure.in
 echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
 
 $ACLOCAL
diff --git a/tests/depcomp8b.test b/tests/depcomp8b.test
index 876f6aa..d4ee9c3 100755
--- a/tests/depcomp8b.test
+++ b/tests/depcomp8b.test
@@ -24,6 +24,7 @@ required='cc libtoolize'
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+#x AM_PROG_CC_C_O
 AM_PROG_AR
 AC_PROG_LIBTOOL
 AC_OUTPUT
@@ -55,7 +56,8 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' 
$MAKE distcheck
 
 # Try again with subdir-objects option.
 
-echo AM_PROG_CC_C_O >> configure.in
+sed 's/#x //' configure.in >configure.int
+mv -f configure.int configure.in
 echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
 
 $ACLOCAL


hooks/post-receive
-- 
GNU Automake