[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-293-gd652a1c

[Ralf Wildenhues]

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=d652a1c0a5bf2f973c5328eed983b4df9ccd284f

The branch, maint has been updated
       via  d652a1c0a5bf2f973c5328eed983b4df9ccd284f (commit)
       via  e8e533e2f5039a34c7c13c9cdd88cfbf0ba2f3ec (commit)
      from  599a8f5ef7241b23ed96b18f32f745d028d26c11 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                |   14 ++++++++++++++
 m4/depend.m4                             |    5 +++--
 tests/parallel-tests-unreadable-log.test |    1 +
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eda168d..c26f1ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-19  Ralf Wildenhues  <address@hidden>
+
+       Allow _AM_DEPENDENCIES to be used later in configure.
+       * m4/depend.m4 (_AM_DEPENDENCIES): Remove a previously existing
+       conftest.dir before recreating it.
+       Fixes bug#7864.
+       Report by Eric Blake, from report by Scott McCreary against M4.
+
+2011-01-18  Ralf Wildenhues  <address@hidden>
+
+       tests: avoid failure on w32 file systems.
+       * tests/parallel-tests-unreadable-log.test: SKIP if file cannot
+       be turned unreadable.
+
 2011-01-17  Ralf Wildenhues  <address@hidden>
 
        tests: allow double-colon spy.test to work with HP-UX make.
diff --git a/m4/depend.m4 b/m4/depend.m4
index 8304180..89d37b2 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -1,12 +1,12 @@
 ##                                                          -*- Autoconf -*-
 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010  Free Software Foundation, Inc.
+# 2010, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 11
+# serial 12
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -46,6 +46,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
diff --git a/tests/parallel-tests-unreadable-log.test 
b/tests/parallel-tests-unreadable-log.test
index 6ebb2b6..572f03d 100755
--- a/tests/parallel-tests-unreadable-log.test
+++ b/tests/parallel-tests-unreadable-log.test
@@ -51,6 +51,7 @@ line=PASS; export line
 $MAKE foo.log
 $MAKE bar.log
 chmod a-r foo.log bar.log
+test ! -r foo.log || Exit 77
 $MAKE test-suite.log >stdout && { cat stdout; Exit 1; }
 cat stdout
 grep '^2 of 2 tests failed *$' stdout


hooks/post-receive
-- 
GNU Automake