From: Ralf Wildenhues Date: Thu, 29 Mar 2007 22:40:41 +0000 (+0000) Subject: * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Again search X-Git-Tag: v1.10b~260 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6e55f6d1fa063286d79c449450b0e2ca52b9916;p=thirdparty%2Fautomake.git * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Again search the whole file, but use sed to reduce the line length. Fixes 1.10 regression. Report by David Byron. * THANKS, NEWS: Update. --- diff --git a/ChangeLog b/ChangeLog index 5dbfeb62a..811bc9a53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-03-30 Ralf Wildenhues + + * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Again search + the whole file, but use sed to reduce the line length. + Fixes 1.10 regression. Report by David Byron. + * THANKS, NEWS: Update. + 2007-03-29 Ralf Wildenhues * lib/depcomp (aix): Rewrite depmode in the spirit of the tru64 diff --git a/NEWS b/NEWS index 50b54919b..19ee8b3b5 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,11 @@ Bugs fixed in 1.10a: * Long standing bugs: - Fix aix dependency tracking for libtool objects. + +* Bugs introduced by 1.10: + + - Fix output of dummy dependency files in presence of post-processed + Makefile.in's again, but also cope with long lines. New in 1.10: diff --git a/THANKS b/THANKS index a5cf27b4d..8be852b2a 100644 --- a/THANKS +++ b/THANKS @@ -56,6 +56,7 @@ Daniel Jacobowitz drow@false.org Dave Brolley brolley@redhat.com Dave Morrison dave@bnl.gov David A. Swierczek swiercze@mr.med.ge.com +David Byron dbyron@dbyron.com Davyd Madeley davyd@fugro-fsi.com.au David Pashley david@davidpashley.com David Zaroski cz253@cleveland.Freenet.Edu diff --git a/m4/depout.m4 b/m4/depout.m4 index 0d9717a10..a7cc30abf 100644 --- a/m4/depout.m4 +++ b/m4/depout.m4 @@ -22,7 +22,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # 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 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue