[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-49-g4f76279

[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=4f76279cd68efb7afb93f2df860d84655ca8ad21

The branch, branch-1.11 has been updated
       via  4f76279cd68efb7afb93f2df860d84655ca8ad21 (commit)
       via  b3d9df070a046d4181b5f1a5e16b0ddfccca05fd (commit)
       via  41431556eb2580d22181a43006146958f765bc2b (commit)
       via  7103a6060500d07a8de598918fa51c557f0367dd (commit)
       via  e1b08fbaa4358c8344440f7cb868d60ccc1cdf66 (commit)
       via  b410859d7b769f39c75be00df413d036a657c0c2 (commit)
      from  89ffd676db1d91a9d127974b9ca6c2d0839eb70e (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 4f76279cd68efb7afb93f2df860d84655ca8ad21
Merge: 89ffd676db1d91a9d127974b9ca6c2d0839eb70e 
b3d9df070a046d4181b5f1a5e16b0ddfccca05fd
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Apr 11 19:58:15 2010 +0200

    Merge branch 'maint' into branch-1.11

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

Summary of changes:
 ChangeLog                           |   39 ++++++++++++++++++
 Makefile.in                         |    2 +-
 NEWS                                |    5 ++-
 THANKS                              |    1 +
 lib/Automake/Channels.pm            |    5 ++-
 lib/am/distdir.am                   |    8 ++--
 tests/Makefile.am                   |    2 +
 tests/Makefile.in                   |    2 +
 tests/aclocal3.test                 |    6 ++-
 tests/confh5.test                   |    4 +-
 tests/distlinks.test                |   73 +++++++++++++++++++++++++++++++++++
 tests/{clean2.test => werror3.test} |   46 ++++++++++------------
 12 files changed, 158 insertions(+), 35 deletions(-)
 create mode 100755 tests/distlinks.test
 copy tests/{clean2.test => werror3.test} (59%)

diff --git a/ChangeLog b/ChangeLog
index 61bef24..ab9ea61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2010-04-11  Ralf Wildenhues  <address@hidden>
+
+       Fix per-Makefile.am setting of -Werror.
+       Before this patch, 'AUTOMAKE_OPTIONS = -Werror' in one
+       Makefile.am would carry over to other Makefile.am files
+       treated afterwards by the same thread, causing inconsistent
+       and unstable exit status values.
+       * lib/Automake/Channels.pm (dup_channel_setup)
+       (drop_channel_setup): Save and restore the setting of
+       $warnings_are_errors.
+       * tests/werror3.test: New test.
+       * tests/Makefile.am: Adjust.
+       * NEWS: Update.
+
+2010-04-11  Stefano Lattarini  <address@hidden>
+
+       Avoid possible false negatives in cond46.test.
+       * tests/cond46.test: Enable shell `errexit' flag (and bumped
+       copyright years).  Due to this change, the testcase should now
+       fail on unexpected failures in calls to $ACLOCAL/$AUTOMAKE (whose
+       outcomes were previously unchecked), and on failures in grepping
+       the expected diagnostic in Automake stderr.
+
+       Make test `aclocal3.test' stricter.
+       * tests/aclocal3.test: Add call to `set -e'.  Fail if $ACLOCAL
+       succeds unexpectedly.
+
+       Add tests checking that symlinks are resolved by `make dist'.
+       * tests/distlinks.test: New test.
+       * tests/Makefile.am (TESTS): Updated accordingly.
+       Suggested by observations from Ralf Wildenhues.
+
+2010-04-11  Ralf Wildenhues  <address@hidden>
+
+       Use -9 for maximum xz compression with dist-xz.
+       * lib/am/distdir.am (dist-xz, dist, dist-all): Pass -9 to xz.
+       * NEWS, THANKS: Update.
+       Report by Pavel Sanda.
+
 2010-03-30  Stefano Lattarini  <address@hidden>
 
        Avoid an unportable use of `$status' shell variable.
diff --git a/Makefile.in b/Makefile.in
index db2d52f..0ce37fe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -610,7 +610,7 @@ dist-lzma: distdir
        $(am__remove_distdir)
 
 dist-xz: distdir
-       tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+       tardir=$(distdir) && $(am__tar) | xz -9 -c >$(distdir).tar.xz
        $(am__remove_distdir)
 
 dist-tarZ: distdir
diff --git a/NEWS b/NEWS
index 7a2f742..fe9170c 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,10 @@ Bugs fixed in 1.11.1a:
   - Several scripts as well as the parallel-tests testsuite driver now
     exit with the right exit status upon receiving a signal.
 
+  - The `dist-xz' option now uses `xz -9' for maximum compression.
+
+  - A per-Makefile.am setting of -Werror does not carry over to the
+    handling of other Makefile.am files any more.
 
 Bugs fixed in 1.11.1:
 
@@ -47,7 +51,6 @@ Bugs fixed in 1.11.1:
     This fixes a race condition where untrusted users could modify files
     in the $(PACKAGE)-$(VERSION) distdir before packing if the toplevel
     build directory was world-searchable.  This is CVE-2009-4029.
-
 
 New in 1.11:
 
diff --git a/THANKS b/THANKS
index 57bb501..4f8fa84 100644
--- a/THANKS
+++ b/THANKS
@@ -261,6 +261,7 @@ Paul Lunau          address@hidden
 Paul Martinolich       address@hidden
 Paul Thomas            address@hidden
 Pavel Roskin           address@hidden
+Pavel Sanda            address@hidden
 Per Bothner            address@hidden
 Per Cederqvist         address@hidden
 Per Oyvind Hvidsten    address@hidden
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index 223d8d2..050ba05 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -710,8 +710,9 @@ entry, while C<drop_channel_setup ()> just deletes it.
 
 =cut
 
-use vars qw (@_saved_channels);
+use vars qw (@_saved_channels @_saved_werrors);
 @_saved_channels = ();
address@hidden = ();
 
 sub dup_channel_setup ()
 {
@@ -721,12 +722,14 @@ sub dup_channel_setup ()
       $channels_copy{$k1} = {%{$channels{$k1}}};
     }
   push @_saved_channels, \%channels_copy;
+  push @_saved_werrors, $warnings_are_errors;
 }
 
 sub drop_channel_setup ()
 {
   my $saved = pop @_saved_channels;
   %channels = %$saved;
+  $warnings_are_errors = pop @_saved_werrors;
 }
 
 =item C<buffer_messages (@types)>, C<flush_messages ()>
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index ec4d5e5..d88656c 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -1,6 +1,6 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-## Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+## 2010 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
@@ -353,7 +353,7 @@ dist-lzma: distdir
 ?XZ?DIST_ARCHIVES += $(distdir).tar.xz
 .PHONY: dist-xz
 dist-xz: distdir
-       tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+       tardir=$(distdir) && $(am__tar) | xz -9 -c >$(distdir).tar.xz
        $(am__remove_distdir)
 
 ?COMPRESS?DIST_ARCHIVES += $(distdir).tar.Z
@@ -397,7 +397,7 @@ dist dist-all: distdir
 ?GZIP? tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c 
>$(distdir).tar.gz
 ?BZIP2?        tardir=$(distdir) && $(am__tar) | bzip2 -9 -c 
>$(distdir).tar.bz2
 ?LZMA? tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-?XZ?   tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+?XZ?   tardir=$(distdir) && $(am__tar) | xz -9 -c >$(distdir).tar.xz
 ?COMPRESS?     tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 ?SHAR? shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 ?ZIP?  -rm -f $(distdir).zip
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 60bbc02..283e06f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -275,6 +275,7 @@ distcom5.test \
 distcom6.test \
 distcom7.test \
 distdir.test \
+distlinks.test \
 distname.test \
 dollar.test \
 dollarvar.test \
@@ -746,6 +747,7 @@ vtexi2.test \
 warnopts.test \
 werror.test \
 werror2.test \
+werror3.test \
 whoami.test \
 xsource.test \
 xz.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 657c00d..c3fd9bc 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -512,6 +512,7 @@ distcom5.test \
 distcom6.test \
 distcom7.test \
 distdir.test \
+distlinks.test \
 distname.test \
 dollar.test \
 dollarvar.test \
@@ -983,6 +984,7 @@ vtexi2.test \
 warnopts.test \
 werror.test \
 werror2.test \
+werror3.test \
 whoami.test \
 xsource.test \
 xz.test \
diff --git a/tests/aclocal3.test b/tests/aclocal3.test
index a550e50..a6aee0f 100755
--- a/tests/aclocal3.test
+++ b/tests/aclocal3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1998, 2002, 2004  Free Software Foundation, Inc.
+# Copyright (C) 1998, 2002, 2004, 2010 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
@@ -17,6 +17,8 @@
 # Test to make sure include of include detects missing macros
 . ./defs || Exit 1
 
+set -e
+
 echo GNOME_X_CHECKS >> configure.in
 
 mkdir macros
@@ -27,6 +29,6 @@ AC_DEFUN([GNOME_X_CHECKS], [
 ])
 END
 
-$ACLOCAL -I macros 2>stderr
+$ACLOCAL -I macros 2>stderr && { cat stderr >&2; Exit 1; }
 cat stderr
 grep 'macros/gnome.m4:2:.*AM_PATH_GTK.*not found' stderr
diff --git a/tests/confh5.test b/tests/confh5.test
index 15593c8..52a3054 100755
--- a/tests/confh5.test
+++ b/tests/confh5.test
@@ -30,7 +30,9 @@ cat > Makefile.am << 'END'
 test: distdir
        test -f $(distdir)/config.h.in
        test -f $(distdir)/include/config.h.in.in
-       test ! -e $(distdir)/include/config.h.in
+       : # Solarish Sh do not support 'test -e'
+       test ! -f $(distdir)/include/config.h.in
+       test ! -r $(distdir)/include/config.h.in
 END
 
 mkdir include
diff --git a/tests/distlinks.test b/tests/distlinks.test
new file mode 100755
index 0000000..41a783d
--- /dev/null
+++ b/tests/distlinks.test
@@ -0,0 +1,73 @@
+#! /bin/sh
+# Copyright (C) 2010 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that distributed symlinks in the source tree will be expanded
+# as regular files in $(distdir).
+
+. ./defs || Exit 1
+
+set -e
+
+echo text > file
+
+ln -s file lnk || {
+  echo "$me: cannot create symlinks to files" >&2
+  Exit 77
+}
+
+mkdir A
+mkdir B
+echo aaa > A/aaa
+cd B
+ln -s ../A/aaa bbb
+cd ..
+
+echo FooBarBaz > foo
+
+ln -s foo  bar1
+ln -s bar1 bar2
+ln -s bar2 bar3
+
+ln -s "`pwd`/foo" quux
+
+echo AC_OUTPUT >>configure.in
+
+echo "me = $me" > Makefile.am  # for better failure messages
+cat >> Makefile.am << 'END'
+EXTRA_DIST = lnk B/bbb bar1 bar2 bar3 quux
+.PHONY: test
+test: distdir
+       ls -l $(distdir) $(distdir)/B
+       fail() { echo "$(me): $$*" >&2; e=1; }; \
+       e=0; \
+       set file lnk A/aaa B/bbb foo quux foo bar1 foo bar2 foo bar3; \
+       while test $$# -ge 2; do \
+         file=$$1; shift; link=$(distdir)/$$1; shift; \
+         test -f $$link || fail "$$link is not a regular file"; \
+         test ! -h $$link || fail "$$link is a symlink"; \
+         diff $$file $$link || fail "$$link differs from $$file"; \
+       done; \
+       exit $$e;
+END
+
+ls -l . A B
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE test
diff --git a/tests/clean2.test b/tests/werror3.test
similarity index 59%
copy from tests/clean2.test
copy to tests/werror3.test
index 99e4c2e..96b4ff3 100755
--- a/tests/clean2.test
+++ b/tests/werror3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2010  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
@@ -14,40 +14,36 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure distclean works in cygnus mode.
-# Report from Daniel Jacobowitz
+# Make sure a per-Makefile.am -Werror setting is not carried over
+# to another Makefile.am.
 
 . ./defs || Exit 1
 
 set -e
 
-cat >> configure.in << 'END'
-AM_MAINTAINER_MODE
+cat >>configure.in <<\END
 AC_CONFIG_FILES([sub/Makefile])
 AC_OUTPUT
 END
 
-cat > Makefile.am << 'END'
-SUBDIRS = sub
-END
-
 mkdir sub
-
-cat > sub/Makefile.am << 'END'
-data_DATA = foo
-
-foo:
-       touch $@
-
-CLEANFILES = $(data_DATA)
+cat >sub/Makefile.am <<\END
+AUTOMAKE_OPTIONS = -Werror
+END
+cat >Makefile.am <<\END
+VAR = foo
+VAR = bar
 END
 
 $ACLOCAL
-$AUTOCONF
-$AUTOMAKE --cygnus
-
-./configure
-$MAKE
-test -f sub/foo
-$MAKE distclean
-test ! -f sub/foo
+
+# The issue would not manifest with threaded execution.
+unset AUTOMAKE_JOBS || :
+AUTOMAKE_run 0 -Wno-error
+grep 'VAR multiply defined' stderr
+
+AUTOMAKE_JOBS=2
+export AUTOMAKE_JOBS
+AUTOMAKE_run 0 -Wno-error
+grep 'VAR multiply defined' stderr
+:


hooks/post-receive
-- 
GNU Automake