[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-207-gfe38508

[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=fe385087e32ac8a30d15f14f4356424a89760daa

The branch, master has been updated
       via  fe385087e32ac8a30d15f14f4356424a89760daa (commit)
       via  bc00e3a554688222aeed8898ae6559087d4933b6 (commit)
      from  d5bec12a1fed7ccadec4885adea35c97e149e720 (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 fe385087e32ac8a30d15f14f4356424a89760daa
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Oct 26 16:29:54 2008 +0100

    No uniquifying for fatal, prog_error, and verbose messages.
    
    There is no point in dropping critical messages, even if they
    are duplicates (unlikely to happen unless they have been sent
    as non-critical messages before), and verbose messages should
    enable to show progress, even using duplicate statements.
    * lib/Automake/ChannelDefs.pm (fatal, automake, verb): Set
    `uniq_part' to `UP_NONE' when registering these channels.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit bc00e3a554688222aeed8898ae6559087d4933b6
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Oct 26 15:55:22 2008 +0100

    Fix 'config.status --file=... depfiles' with new Autoconf.
    
    * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Eval
    $CONFIG_STATUS contents if we detect the quoting used by
    Autoconf 2.62 and newer for --file=.
    * tests/depend5.test: New test.
    * tests/Makefile.am: Update.
    * NEWS, THANKS: Update.
    Report by Sam Steingold against gnulib.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                   |   19 +++++++++++
 NEWS                        |    4 ++
 THANKS                      |    1 +
 lib/Automake/ChannelDefs.pm |    9 +++--
 m4/depout.m4                |   15 +++++++--
 tests/Makefile.am           |    1 +
 tests/Makefile.in           |    1 +
 tests/depend5.test          |   71 +++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 114 insertions(+), 7 deletions(-)
 create mode 100755 tests/depend5.test

diff --git a/ChangeLog b/ChangeLog
index 2c0a326..9b6a312 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2008-10-26  Ralf Wildenhues  <address@hidden>
+
+       No uniquifying for fatal, prog_error, and verbose messages.
+       There is no point in dropping critical messages, even if they
+       are duplicates (unlikely to happen unless they have been sent
+       as non-critical messages before), and verbose messages should
+       enable to show progress, even using duplicate statements.
+       * lib/Automake/ChannelDefs.pm (fatal, automake, verb): Set
+       `uniq_part' to `UP_NONE' when registering these channels.
+
+       Fix 'config.status --file=... depfiles' with new Autoconf.
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Eval
+       $CONFIG_STATUS contents if we detect the quoting used by
+       Autoconf 2.62 and newer for --file=.
+       * tests/depend5.test: New test.
+       * tests/Makefile.am: Update.
+       * NEWS, THANKS: Update.
+       Report by Sam Steingold against gnulib.
+
 2008-10-26  Johan Dahlin  <address@hidden>
 
        Support for Python 3.0, drop support for pre-2.0.
diff --git a/NEWS b/NEWS
index 42107a2..dce4bbd 100644
--- a/NEWS
+++ b/NEWS
@@ -115,6 +115,10 @@ Bugs fixed in 1.10a:
   - For nobase_*_LTLIBRARIES with nonempty directory components, the
     correct `-rpath' argument is used now.
 
+  - `config.status --file=Makefile depfiles' now also works with the
+    extra quoting used internally used by Autoconf 2.62 and newer
+    (it used to work only without the `--file=' bit).
+
 * Bugs introduced by 1.10:
 
   - Fix output of dummy dependency files in presence of post-processed
diff --git a/THANKS b/THANKS
index f79a7a0..eb67976 100644
--- a/THANKS
+++ b/THANKS
@@ -280,6 +280,7 @@ Rusty Ballinger             address@hidden
 Ryan T. Sammartino     address@hidden
 Sam Hocevar            address@hidden
 Sam Sirlin             address@hidden
+Sam Steingold          address@hidden
 Sander Niemeijer       address@hidden
 Santiago Vila          address@hidden
 Scott James Remnant    address@hidden
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index 898b1ea..eff5d52 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2006, 2008 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
@@ -129,7 +129,7 @@ Informative messages.
 # Do not forget to update &usage and the manual
 # if you add or change a warning channel.
 
-register_channel 'fatal', type => 'fatal';
+register_channel 'fatal', type => 'fatal', uniq_part => UP_NONE;
 register_channel 'error', type => 'error';
 register_channel 'error-gnu', type => 'error';
 register_channel 'error-gnu/warn', type => 'error';
@@ -138,7 +138,8 @@ register_channel 'automake', type => 'fatal', backtrace => 
1,
   header => ("####################\n" .
             "## Internal Error ##\n" .
             "####################\n"),
-  footer => "\nPlease contact <address@hidden>.";
+  footer => "\nPlease contact <address@hidden>.",
+  uniq_part => UP_NONE;
 
 register_channel 'gnu', type => 'warning';
 register_channel 'obsolete', type => 'warning', silent => 1;
@@ -147,7 +148,7 @@ register_channel 'portability', type => 'warning', silent 
=> 1;
 register_channel 'syntax', type => 'warning';
 register_channel 'unsupported', type => 'warning';
 
-register_channel 'verb', type => 'debug', silent => 1;
+register_channel 'verb', type => 'debug', silent => 1, uniq_part => UP_NONE;
 register_channel 'note', type => 'debug', silent => 0;
 
 =head2 FUNCTIONS
diff --git a/m4/depout.m4 b/m4/depout.m4
index a7cc30a..3f5d6cf 100644
--- a/m4/depout.m4
+++ b/m4/depout.m4
@@ -1,18 +1,27 @@
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
 # 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 3
+#serial 4
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
+[# Autoconf 2.62 quotes --file arguments for eval, but not when files
+# are listed without --file.  Let's play safe and only enable the eval
+# if we detect the quoting.
+case $CONFIG_FILES in
+*\'*) eval set x "$CONFIG_FILES" ;;
+*)   set x $CONFIG_FILES ;;
+esac
+shift
+for mf
+do
   # Strip MF so we end up with the name of the file.
   mf=`echo "$mf" | sed -e 's/:.*$//'`
   # Check whether this is an Automake generated Makefile or not.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cc95743..77dd1f1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -222,6 +222,7 @@ depend.test \
 depend2.test \
 depend3.test \
 depend4.test \
+depend5.test \
 destdir.test \
 dirforbid.test \
 dirlist.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9eec016..67e5420 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -374,6 +374,7 @@ depend.test \
 depend2.test \
 depend3.test \
 depend4.test \
+depend5.test \
 destdir.test \
 dirforbid.test \
 dirlist.test \
diff --git a/tests/depend5.test b/tests/depend5.test
new file mode 100755
index 0000000..5644933
--- /dev/null
+++ b/tests/depend5.test
@@ -0,0 +1,71 @@
+#! /bin/sh
+# Copyright (C) 2008  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 3, 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 _AM_OUTPUT_DEPENDENCY_COMMANDS works with eval-style
+# quoting in $CONFIG_FILES, done by newer Autoconf.
+
+. ./defs || Exit 1
+
+set -e
+
+cat >>configure.in << END
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << END
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c foo.h
+END
+
+cat >foo.c << END
+#include "foo.h"
+END
+: >foo.h
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+./configure --enable-dependency-tracking
+if test -d .deps; then
+  depdir=.deps
+elif test -d _deps; then
+  depdir=_deps
+else
+  depdir=
+fi
+
+# For the fun of it, we should also cope with makefile
+# names that contain weird characters, with Autoconf 2.62
+# and newer.
+name='weird  name with $ `#() &! characters"'
+cp Makefile.in "$name.in"
+
+for arg in Makefile \
+  --file=Makefile \
+  "--file=$name"
+do
+  rm -rf .deps _deps
+  ./config.status "$arg" depfiles >stdout 2>stderr
+  cat stdout
+  cat stderr >&2
+  grep '[Nn]o such file' stderr && Exit 1
+
+  if test -n "$depdir"; then
+    test -d $depdir || Exit 1
+  fi
+done
+:


hooks/post-receive
--
GNU Automake