!*^&$@ sed portability problems... The test on AC_CHECK_TYPES is

failing on RISC/OS 4.52 because of the forget-to-reset-the-flag
bug in its sed.

* acgeneral.m4 (_AC_OUTPUT_HEADERS): Work around this bug.

diff --git a/ChangeLog b/ChangeLog
index ee944a30ce7121c7da6fac6666caf04275f88d92..9b0063c18fc16670673b145937f363e3b77ceed1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-11  Akim Demaille  <akim@epita.fr>
+
+       !*^&$@ sed portability problems...  The test on AC_CHECK_TYPES is
+       failing on RISC/OS 4.52 because of the forget-to-reset-the-flag
+       bug in its sed.
+
+       * acgeneral.m4 (_AC_OUTPUT_HEADERS): Work around this bug.
+
 2000-07-11  Akim Demaille  <akim@epita.fr>
 
        * acspecific.m4 (AC_INT_16_BITS, AC_LONG_64_BITS): s/ac_check/ac_cv/.

diff --git a/acgeneral.m4 b/acgeneral.m4
index bf05b0fa6479cee58beada86a2ea268e5cb284b7..0a2e31f10d510b2f2d3ec9dcf0fd4ed9b065f030 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -4846,13 +4846,16 @@ echo '  :' >>$CONFIG_STATUS
 rm -f conftest.tail
 while grep . conftest.defines >/dev/null
 do
-  # Write a limited-size here document to $tmp/frag.
-  echo '  cat >$tmp/frag <<CEOF' >>$CONFIG_STATUS
-dnl Speed up: don't consider the non `#define' lines.
+  # Write a limited-size here document to $tmp/defines.sed.
+  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+  # Speed up: don't consider the non `#define' lines.
   echo ['/^[   ]*#[    ]*define/!b'] >>$CONFIG_STATUS
+  # Work around the forget-to-reset-the-flag bug.
+  echo 't clr' >>$CONFIG_STATUS
+  echo ': clr' >>$CONFIG_STATUS
   sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
   echo 'CEOF
-  sed -f $tmp/frag $tmp/in >$tmp/out
+  sed -f $tmp/defines.sed $tmp/in >$tmp/out
   rm -f $tmp/in
   mv $tmp/out $tmp/in
 ' >>$CONFIG_STATUS
@@ -4870,13 +4873,16 @@ echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
 rm -f conftest.tail
 while grep . conftest.undefs >/dev/null
 do
-  # Write a limited-size here document to $tmp/frag.
-  echo '  cat >$tmp/frag <<CEOF' >>$CONFIG_STATUS
-dnl Speed up: don't consider the non `#undef'
+  # Write a limited-size here document to $tmp/undefs.sed.
+  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+  # Speed up: don't consider the non `#undef'
   echo ['/^[   ]*#[    ]*undef/!b'] >>$CONFIG_STATUS
+  # Work around the forget-to-reset-the-flag bug.
+  echo 't clr' >>$CONFIG_STATUS
+  echo ': clr' >>$CONFIG_STATUS
   sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
   echo 'CEOF
-  sed -f $tmp/frag $tmp/in >$tmp/out
+  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
   rm -f $tmp/in
   mv $tmp/out $tmp/in
 ' >>$CONFIG_STATUS

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index bf05b0fa6479cee58beada86a2ea268e5cb284b7..0a2e31f10d510b2f2d3ec9dcf0fd4ed9b065f030 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -4846,13 +4846,16 @@ echo '  :' >>$CONFIG_STATUS
 rm -f conftest.tail
 while grep . conftest.defines >/dev/null
 do
-  # Write a limited-size here document to $tmp/frag.
-  echo '  cat >$tmp/frag <<CEOF' >>$CONFIG_STATUS
-dnl Speed up: don't consider the non `#define' lines.
+  # Write a limited-size here document to $tmp/defines.sed.
+  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+  # Speed up: don't consider the non `#define' lines.
   echo ['/^[   ]*#[    ]*define/!b'] >>$CONFIG_STATUS
+  # Work around the forget-to-reset-the-flag bug.
+  echo 't clr' >>$CONFIG_STATUS
+  echo ': clr' >>$CONFIG_STATUS
   sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
   echo 'CEOF
-  sed -f $tmp/frag $tmp/in >$tmp/out
+  sed -f $tmp/defines.sed $tmp/in >$tmp/out
   rm -f $tmp/in
   mv $tmp/out $tmp/in
 ' >>$CONFIG_STATUS
@@ -4870,13 +4873,16 @@ echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
 rm -f conftest.tail
 while grep . conftest.undefs >/dev/null
 do
-  # Write a limited-size here document to $tmp/frag.
-  echo '  cat >$tmp/frag <<CEOF' >>$CONFIG_STATUS
-dnl Speed up: don't consider the non `#undef'
+  # Write a limited-size here document to $tmp/undefs.sed.
+  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+  # Speed up: don't consider the non `#undef'
   echo ['/^[   ]*#[    ]*undef/!b'] >>$CONFIG_STATUS
+  # Work around the forget-to-reset-the-flag bug.
+  echo 't clr' >>$CONFIG_STATUS
+  echo ': clr' >>$CONFIG_STATUS
   sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
   echo 'CEOF
-  sed -f $tmp/frag $tmp/in >$tmp/out
+  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
   rm -f $tmp/in
   mv $tmp/out $tmp/in
 ' >>$CONFIG_STATUS