Happy New Year!

2011-01-01 Thread Ralf Wildenhues
... and apologies for my longer than predicted time off the net.
All the best to you and GNU!

Pushed to maint as below.

Cheers,
Ralf

Bump copyright years.

* aclocal.in (write_aclocal, version): Bump copyright years.
* automake.in (gen_copyright, version): Likewise.
* doc/automake.texi: Likewise.

diff --git a/aclocal.in b/aclocal.in
index b5c2c41..2210fe3 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -8,7 +8,8 @@ eval 'case $# in 0) exec @PERL@ -S $0;; *) exec @PERL@ -S 
$0 $@;; esac'
 # aclocal - create aclocal.m4 by scanning configure.ac
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -818,7 +819,8 @@ $output;
   $output = # generated automatically by aclocal $VERSION -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 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.
@@ -910,7 +912,7 @@ sub version()
 {
   print EOF;
 aclocal (GNU $PACKAGE) $VERSION
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 License GPLv2+: GNU GPL version 2 or later 
http://gnu.org/licenses/gpl-2.0.html
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/automake.in b/automake.in
index bf45fa7..fa110a5 100755
--- a/automake.in
+++ b/automake.in
@@ -7,7 +7,7 @@ eval 'case $# in 0) exec @PERL@ -S $0;; *) exec @PERL@ -S 
$0 $@;; esac'
 
 # automake - create Makefile.in from Makefile.am
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
 # Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -258,7 +258,7 @@ my %standard_prefix =
 # Copyright on generated Makefile.ins.
 my $gen_copyright = \
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
 # Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -8404,7 +8404,7 @@ sub version ()
 {
   print EOF;
 automake (GNU $PACKAGE) $VERSION
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 License GPLv2+: GNU GPL version 2 or later 
http://gnu.org/licenses/gpl-2.0.html
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/doc/automake.texi b/doc/automake.texi
index ab5f861..1f4b9ec 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -24,8 +24,8 @@
 Makefiles from template files.
 
 Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-Inc.
+2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document



Re: [PATCH v3] Work around a bug in Solaris make's file-inclusion mechanism.

2011-01-01 Thread Ralf Wildenhues
Hi Stefano,

this has since been applied to maint:

* Stefano Lattarini wrote on Fri, Dec 17, 2010 at 08:46:26PM CET:
 Subject: [PATCH] Work around a bug in file-inclusion mechanism of Solaris 
 make.
 
 * automake.in (handle_single_transform): In the name of the
 dependency file: collapse multiple slash characters into a single
 one.
 * tests/subobj11a.test: New test.
 * tests/subobj11b.test: Likewise.
 * tests/subobj11c.test: Likewise.
 * tests/depcomp8a.test: Likewise.
 * tests/depcomp8b.test: Likewise.
 * tests/Makefile.am (TESTS): Updated.
 * NEWS: Updated.

I'm pushing this patch to fix a maintainer-check regression introduced
by this patch.

Cheers,
Ralf

Fix maintainer-check regression.

* tests/subobj11a.test: Pass DISTCHECK_CONFIGURE_FLAGS in the
environment.

diff --git a/tests/subobj11a.test b/tests/subobj11a.test
index c39e67c..3bf3012 100755
--- a/tests/subobj11a.test
+++ b/tests/subobj11a.test
@@ -76,7 +76,7 @@ $FGREP z...@rd@z quux
 
 $MAKE
 
-$MAKE DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' distcheck
-$MAKE DISTCHECK_CONFIGURE_FLAGS='--disable-dependency-tracking' distcheck
+DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
+DISTCHECK_CONFIGURE_FLAGS='--disable-dependency-tracking' $MAKE distcheck
 
 :



Re: [FYI] {master} Add some tests on 'cygnus' mode

2011-01-01 Thread Ralf Wildenhues
Hi Stefano,

* Stefano Lattarini wrote on Wed, Dec 22, 2010 at 11:55:04PM CET:
 Attached is what I pushed (to *master* only).

 From 7e7a8a6497cbc2473a3e25dd1067f2d44346325e Mon Sep 17 00:00:00 2001
 From: Stefano Lattarini stefano.lattar...@gmail.com
 Date: Tue, 21 Dec 2010 22:59:19 +0100
 Subject: [PATCH] Add some tests on 'cygnus' mode.
 
 * tests/clean2.test: Extend.
 * tests/cygnus-check-without-all.test: New test.
 * tests/cygnus-dependency-tracking.test: Likewise.
 * tests/cygnus-distclean.test: Likewise.
 * tests/cygnus-imply-foreign.test: Likewise.
 * tests/cygnus-no-dist.test: Likewise.
 * tests/cygnus-no-installinfo.test: Likewise.
 * tests/cygnus-requires-maintainer-mode.test: Likewise.
 * tests/Makefile.am (TESTS): Update.

Thank you.  I'm pushing this followup patch to fix spurious failures of
the test on fast systems.  I'll be opening a PR for the underlying issue
in a minute.

Cheers,
Ralf

Fix caching bug in cygnus mode test.

* tests/cygnus-requires-maintainer-mode.test: Remove
autom4te.cache directory before rerunning aclocal, to
remove trace caches.

diff --git a/tests/cygnus-requires-maintainer-mode.test 
b/tests/cygnus-requires-maintainer-mode.test
index 4f893f2..f6db92d 100755
--- a/tests/cygnus-requires-maintainer-mode.test
+++ b/tests/cygnus-requires-maintainer-mode.test
@@ -39,6 +39,7 @@ cat  sub/Makefile.am 'END'
 AUTOMAKE_OPTIONS = cygnus
 END
 
+rm -rf autom4te.cache
 $ACLOCAL
 AUTOMAKE_fails
 grep '^configure\.in:.*AM_MAINTAINER_MODE.*required.*cygnus' stderr
@@ -47,6 +48,7 @@ cat  configure.in 'END'
 AM_MAINTAINER_MODE
 END
 
+rm -rf autom4te.cache
 $ACLOCAL
 $AUTOMAKE --cygnus