From: Eric Blake <ebb9@byu.net>
Date: Mon, 27 Oct 2008 22:34:58 +0000 (-0600)
Subject: Avoid raw carriage return in scripts.
X-Git-Tag: v2.63b~184
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb34ecf15c8153b9a67fa168510d2c4594d3049e;p=thirdparty%2Fautoconf.git

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 <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index 06d08ded2..e7704b2c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-27  Eric Blake  <ebb9@byu.net>
+
+	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  <ebb9@byu.net>
 
 	Use AS_VAR_ARITH.
diff --git a/THANKS b/THANKS
index 0488f2958..f566006c4 100644
--- a/THANKS
+++ b/THANKS
@@ -325,6 +325,7 @@ Steve Chamberlain           sac@cygnus.com
 Steve Huston                shuston@riverace.com
 Steve Robbins               steve@nyongwa.montreal.qc.ca
 Steven G. Johnson           stevenj@alum.mit.edu
+Steven R. Loomis            srl@icu-project.org
 Stu Grossman                grossman@cygnus.com
 Sumit Pandya                sumit@elitecore.com
 Syd Polk                    spolk@cygnus.com
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 3cbf618e7..eb3ddbd4e 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'