Re: revisit: bare carriage return in status.m4 / configure

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Eric Blake on 10/27/2008 4:01 PM:
> I agree that using raw ^M in a portable script comes with its own set of 
> portability problems, therfore I will commit a patch that switches over to tr 
> in the near future.  Thanks Steven for the report, and Thomas for the patch 
> idea.

Committing:

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkkGfvkACgkQ84KuGfSFAYAPHQCghh72jwKRoNlMz/abXLDnngQ7
OLgAn3aiM8tEV09NFRNPAq/r4DQTZ4HH
=efxE
-----END PGP SIGNATURE-----

From cb34ecf15c8153b9a67fa168510d2c4594d3049e Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Mon, 27 Oct 2008 16:34:58 -0600
Subject: [PATCH] Avoid raw carriage return in scripts.

* lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Generate CR
via tr, rather than with literal byte.
* THANKS: Update.
Reported by Steven R. Loomis; patch suggested by Thomas Dickey.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog              |    8 ++++++++
 THANKS                 |    1 +
 lib/autoconf/status.m4 |    2 +-
 3 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 06d08de..e7704b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-10-27  Eric Blake  <address@hidden>
 
+       Avoid raw carriage return in scripts.
+       * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Generate CR
+       via tr, rather than with literal byte.
+       * THANKS: Update.
+       Reported by Steven R. Loomis; patch suggested by Thomas Dickey.
+
+2008-10-27  Eric Blake  <address@hidden>
+
        Use AS_VAR_ARITH.
        * lib/autotest/general.m4 (at_func_arith): Delete; replace all
        clients with AS_VAR_ARITH instead.
diff --git a/THANKS b/THANKS
index 0488f29..f566006 100644
--- a/THANKS
+++ b/THANKS
@@ -325,6 +325,7 @@ Steve Chamberlain           address@hidden
 Steve Huston                address@hidden
 Steve Robbins               address@hidden
 Steven G. Johnson           address@hidden
+Steven R. Loomis            address@hidden
 Stu Grossman                address@hidden
 Sumit Pandya                address@hidden
 Syd Polk                    address@hidden
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 3cbf618..eb3ddbd 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -370,7 +370,7 @@ else
   # The final `:' finishes the AND list.
   ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }'
 fi]])
-ac_cr='
'
+ac_cr=`echo X | tr X '\015'`
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
   ac_cs_awk_cr='\\r'
-- 
1.6.0.2