[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. v1.10.2-15-gf9a3dde

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

The branch, branch-1-10 has been updated
       via  f9a3dde93cbd6497966d45631ec1cf665b09e3a9 (commit)
      from  e225851a3a88c2644e849e8958d598bc7d1dc65b (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 f9a3dde93cbd6497966d45631ec1cf665b09e3a9
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Dec 21 17:33:17 2008 +0100

    Fix config.status depfiles failure.
    
    * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Commands are
    again a single shell brace group, so they are correctly skipped
    when dependencies are turned off.  The failure is noisy with
    ksh only.
    * tests/depend6.test: New test.
    * tests/Makefile.am: Adjust.
    * THANKS: Update.
    Report and different suggested patch by Markus Duft.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                             |   12 ++++
 THANKS                                |    1 +
 m4/depout.m4                          |   98 +++++++++++++++++----------------
 tests/Makefile.am                     |    1 +
 tests/Makefile.in                     |    1 +
 tests/{libtoo11.test => depend6.test} |   29 ++++++----
 6 files changed, 83 insertions(+), 59 deletions(-)
 copy tests/{libtoo11.test => depend6.test} (66%)

diff --git a/ChangeLog b/ChangeLog
index 7d35c38..579f4d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-12-21  Ralf Wildenhues  <address@hidden>
+
+       Fix config.status depfiles failure.
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Commands are
+       again a single shell brace group, so they are correctly skipped
+       when dependencies are turned off.  The failure is noisy with
+       ksh only.
+       * tests/depend6.test: New test.
+       * tests/Makefile.am: Adjust.
+       * THANKS: Update.
+       Report and different suggested patch by Markus Duft.
+
 2008-12-21  Zoltan Rado  <address@hidden>  (tiny change)
 
        * doc/automake.texi (DESTDIR): Fix a couple of typos.
diff --git a/THANKS b/THANKS
index 398ce83..90f80cd 100644
--- a/THANKS
+++ b/THANKS
@@ -185,6 +185,7 @@ Mark Galassi                address@hidden
 Mark Mitchell          address@hidden
 Mark Phillips          address@hidden
 Markku Rossi           address@hidden
+Markus Duft            address@hidden
 Markus F.X.J. Oberhumer        address@hidden
 Martin Bravenboer      address@hidden
 Martin Frydl           address@hidden
diff --git a/m4/depout.m4 b/m4/depout.m4
index 3f5d6cf..80a3926 100644
--- a/m4/depout.m4
+++ b/m4/depout.m4
@@ -7,59 +7,61 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 4
+#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[# 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.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 
2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+[{
+  # 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.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 
2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 950970f..195fd7d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -211,6 +211,7 @@ depend2.test \
 depend3.test \
 depend4.test \
 depend5.test \
+depend6.test \
 destdir.test \
 dirforbid.test \
 dirlist.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index d19800a..d1bb274 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -344,6 +344,7 @@ depend2.test \
 depend3.test \
 depend4.test \
 depend5.test \
+depend6.test \
 destdir.test \
 dirforbid.test \
 dirlist.test \
diff --git a/tests/libtoo11.test b/tests/depend6.test
similarity index 66%
copy from tests/libtoo11.test
copy to tests/depend6.test
index 030e2d3..6a1595c 100755
--- a/tests/libtoo11.test
+++ b/tests/depend6.test
@@ -14,25 +14,32 @@
 # 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 config.lt is removed with Libtool 2.2.x's LT_OUTPUT.
-# Report by Charles Wilson.
+# Check for _AM_OUTPUT_DEPENDENCY_COMMANDS grouping bug,
+# reported by Markus Duft.
 
-required=libtoolize
 . ./defs || Exit 1
+
 set -e
 
-cat >> configure.in << 'END'
-AC_PROG_LIBTOOL
-m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+cat >>configure.in << END
+AC_PROG_CC
 AC_OUTPUT
 END
 
-: > Makefile.am
+cat > Makefile.am << END
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c foo.h
+END
+
+cat >foo.c << END
+#include "foo.h"
+END
+: >foo.h
 
-libtoolize
 $ACLOCAL
-$AUTOMAKE --add-missing
+$AUTOMAKE
 $AUTOCONF
-./configure
-$MAKE distcheck
+./configure --disable-dependency-tracking 2>stderr || { cat stderr >&2; Exit 
1; }
+cat stderr >&2
+grep shift stderr && Exit 1
 :


hooks/post-receive
--
GNU Automake