* 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 5dbfeb62ad99616d15d284f141354a9c6b51f54a..811bc9a53e97fcc9b059ff5d1fe936d962f07e66 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * 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  <Ralf.Wildenhues@gmx.de>
 
        * lib/depcomp (aix): Rewrite depmode in the spirit of the tru64

diff --git a/NEWS b/NEWS
index 50b54919b09eb2353e6e48008ec8d9c7d8d41133..19ee8b3b55ad738edf0feb4801b49971948b1336 100644 (file)
--- 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.
 \f
 New in 1.10:
 

diff --git a/THANKS b/THANKS
index a5cf27b4dedbf49f32ffc390e676e93fe2293a69..8be852b2a54bb9a1e8929a23d5dff03d126a5956 100644 (file)
--- 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 0d9717a100dda036ab0271520f732b83940751be..a7cc30abfc2550290d6db693e3decf870d966011 100644 (file)
--- 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