* lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE):

Don't assume 'grep' works on long lines, since AIX grep doesn't.

diff --git a/ChangeLog b/ChangeLog
index 065eaf1cbe21b40b5191e0478a92d50a8ddfcbef..c61dbd1e2aab7f4fd1c66db5436c620c5ce1ef59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+       and Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE):
+       Don't assume 'grep' works on long lines, since AIX grep doesn't.
+
 2005-05-28  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * lib/autoconf/status.m4 (_AC_OUTPUT_FILE): Do not use `grep' on

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 76a4fb998ce4648cddd1bc804a1c144940aaacf4..3e1e711e65de3ecd7b2acb892dbaa9b586f1a0d9 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -401,7 +401,8 @@ m4_if(_AC_SED_CMD_LIMIT,
       m4_if(_AC_Var, [@END@], m4_if(_AC_SED_CMD_NUM, 2, 2, _AC_SED_CMD_LIMIT), _AC_SED_CMD_NUM),
 [_ACEOF
 
-  if test `grep -c "$ac_delim\$" conf$$subs.sed` = _AC_SED_DELIM_NUM; then
+dnl Do not use grep on conf$$subs.sed, since AIX grep has a line length limit.
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = _AC_SED_DELIM_NUM; then
     break
   elif $ac_last_try; then
     AC_MSG_ERROR([could not make $CONFIG_STATUS])
@@ -410,10 +411,11 @@ m4_if(_AC_SED_CMD_LIMIT,
   fi
 done
 
-ac_eof=
-if grep '^CEOF$' conf$$subs.sed >/dev/null; then
-  ac_eof=`sed -n '/^CEOF[[0-9]]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
-  ac_eof=`expr 0$ac_eof + 1`
+dnl Similarly, avoid grep here too.
+ac_eof=`sed -n '/^CEOF[[0-9]]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
 fi
 
 dnl Increment fragment number.