diff -u automake1.10-1.10.2/debian/changelog automake1.10-1.10.2/debian/changelog --- automake1.10-1.10.2/debian/changelog +++ automake1.10-1.10.2/debian/changelog @@ -1,3 +1,12 @@ +automake1.10 (1:1.10.2-0ubuntu2) jaunty; urgency=low + + * Backport upstream commit f9a3dde93cbd6497966d45631ec1cf665b09e3a9 to fix + regression vs 1.10.1 to fix a depfiles failure which rendered some + source packages unbuildable. Thanks to Mirco Bauer for helping to + investigate and isolate the fix. (LP: #356612) + + -- Iain Lane Mon, 06 Apr 2009 22:15:09 +0100 + automake1.10 (1:1.10.2-0ubuntu1) jaunty; urgency=low * New upstream release: only in patch2: unchanged: only in patch2: unchanged: --- automake1.10-1.10.2.orig/m4/depout.m4 +++ automake1.10-1.10.2/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 only in patch2: unchanged: --- automake1.10-1.10.2.orig/tests/Makefile.am +++ automake1.10-1.10.2/tests/Makefile.am @@ -211,6 +211,7 @@ depend3.test \ depend4.test \ depend5.test \ +depend6.test \ destdir.test \ dirforbid.test \ dirlist.test \ only in patch2: unchanged: --- automake1.10-1.10.2.orig/tests/Makefile.in +++ automake1.10-1.10.2/tests/Makefile.in @@ -344,6 +344,7 @@ depend3.test \ depend4.test \ depend5.test \ +depend6.test \ destdir.test \ dirforbid.test \ dirlist.test \ only in patch2: unchanged: --- automake1.10-1.10.2.orig/tests/depend6.test +++ automake1.10-1.10.2/tests/depend6.test @@ -0,0 +1,45 @@ +#! /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 . + +# Check for _AM_OUTPUT_DEPENDENCY_COMMANDS grouping bug, +# reported by Markus Duft. + +. ./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 --disable-dependency-tracking 2>stderr || { cat stderr >&2; Exit 1; } +cat stderr >&2 +grep shift stderr && Exit 1 +: