* m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Do not use

plain `grep' on the Makefile, as its line length may exceed that
for grep.  Bug report against coreutils by Sam Sirlin.
* THANKS: Update.

diff --git a/ChangeLog b/ChangeLog
index a0c4e76c40483d4ffb590f8134e8fbb7beec6c6c..6a8f273428ebbc80702748e22a4c538a7ee8d648 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Do not use
+       plain `grep' on the Makefile, as its line length may exceed that
+       for grep.  Bug report against coreutils by Sam Sirlin.
+       * THANKS: Update.
+
 2006-05-26  Sergey Poznyakoff  <gray@Mirddin.farlep.net>  (tiny change)
 
        * doc/automake.texi (Options): Add anchor `tar-formats'.

diff --git a/THANKS b/THANKS
index dd991e21609e831be7fa7540f285bfc347eb20f3..323379271f8ecb60a3cab00801fa073f52652d88 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -248,6 +248,7 @@ Ronald Landheer             ronald@landheer.com
 Rusty Ballinger                rusty@rlyeh.engr.sgi.com
 Ryan T. Sammartino     ryants@shaw.ca
 Sam Hocevar            sam@zoy.org
+Sam Sirlin             sam@kalessin.jpl.nasa.gov
 Sander Niemeijer       niemeijer@science-and-technology.nl
 Santiago Vila          sanvila@unex.es
 Scott James Remnant    scott@netsplit.com

diff --git a/m4/depout.m4 b/m4/depout.m4
index 9a987a8a82ce71751a1b24d424268bd61145b2a8..0d9717a100dda036ab0271520f732b83940751be 100644 (file)
--- a/m4/depout.m4
+++ b/m4/depout.m4
@@ -20,8 +20,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # 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.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # 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
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue