[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. Release-1-10-1-44-g936f657

[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=936f6572fe658a06d3944c9c971f6b30aaf5bcca

The branch, branch-1-10 has been updated
       via  936f6572fe658a06d3944c9c971f6b30aaf5bcca (commit)
      from  d43be558513def18a288036bbb531d39cbd304eb (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 936f6572fe658a06d3944c9c971f6b30aaf5bcca
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                         |   11 ++++++++
 NEWS                              |    4 +++
 THANKS                            |    1 +
 m4/depout.m4                      |   15 +++++++++--
 tests/Makefile.am                 |    1 +
 tests/Makefile.in                 |    1 +
 tests/{man3.test => depend5.test} |   50 +++++++++++++++++++++++++-----------
 7 files changed, 65 insertions(+), 18 deletions(-)
 copy tests/{man3.test => depend5.test} (52%)

diff --git a/ChangeLog b/ChangeLog
index 82f9d1c..c50ea91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-10-26  Ralf Wildenhues  <address@hidden>
+
+       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-18  Ralf Wildenhues  <address@hidden>
 
        Fix comment typos.
diff --git a/NEWS b/NEWS
index dd81fc7..344f5a2 100644
--- a/NEWS
+++ b/NEWS
@@ -52,6 +52,10 @@ Bugs fixed in 1.10.1:
   - All directories `.libs'/`_libs' used by libtool are cleaned now,
     not only those in which libraries are built.
 
+  - `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 e353a35..9c6b33e 100644
--- a/THANKS
+++ b/THANKS
@@ -276,6 +276,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/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 cf27cd9..8892c1e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -210,6 +210,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 e7dd983..f47d272 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -343,6 +343,7 @@ depend.test \
 depend2.test \
 depend3.test \
 depend4.test \
+depend5.test \
 destdir.test \
 dirforbid.test \
 dirlist.test \
diff --git a/tests/man3.test b/tests/depend5.test
similarity index 52%
copy from tests/man3.test
copy to tests/depend5.test
index fe9394d..1474909 100755
--- a/tests/man3.test
+++ b/tests/depend5.test
@@ -14,31 +14,51 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# PR 516: Prefer generated manpages to distributed ones.
+# Check that _AM_OUTPUT_DEPENDENCY_COMMANDS works with eval-style
+# quoting in $CONFIG_FILES, done by newer Autoconf.
 
-. ./defs || exit 1
+. ./defs || Exit 1
 
 set -e
 
-cat > Makefile.am << 'END'
-dist_man_MANS = foo.1
-installcheck-local:
-       grep bar "$(mandir)/man1/foo.1"
+cat >>configure.in << END
+AC_PROG_CC
+AC_OUTPUT
 END
 
-cat >>configure.in <<'END'
-: ${foo=foo}
-AC_SUBST([foo])
-AC_CONFIG_FILES([foo.1])
-AC_OUTPUT
+cat > Makefile.am << END
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c foo.h
 END
 
-cat > foo.1.in <<'END'
address@hidden@
+cat >foo.c << END
+#include "foo.h"
 END
+: >foo.h
 
 $ACLOCAL
 $AUTOMAKE
 $AUTOCONF
-./configure
-DISTCHECK_CONFIGURE_FLAGS=foo=bar $MAKE -e distcheck
+./configure --enable-dependency-tracking
+if test -d .deps; then
+  depdir=.deps
+elif test -d _deps; then
+  depdir=_deps
+else
+  depdir=
+fi
+
+for arg in Makefile \
+  --file=Makefile
+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