Fix substitution of carriage return on Darwin.

* lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Set
ac_cs_awk_cr to '\\r', so that sed portably expands this to '\r'
rather than a literal carriage return, to fix substitution on
Darwin.  Regression introduced in 2.63b.
Report by Peter O'Gorman.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index ec631ffb1059f4d74c38462ec94e4c538e9f0a60..18aa1699faab61142b8b8e832ec28096abbe29e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Fix substitution of carriage return on Darwin.
+       * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Set
+       ac_cs_awk_cr to '\\r', so that sed portably expands this to '\r'
+       rather than a literal carriage return, to fix substitution on
+       Darwin.  Regression introduced in 2.63b.
+       Report by Peter O'Gorman.
+
 2010-01-21  Dmitry V. Levin <ldv@altlinux.org>
 
        Fix test failure when a shell uses $TMPDIR for here-documents.

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 3fddc38b5ab07453d01ae4a437699d084e1d99b5..5988a61c30cbb6e87438887143f135b98b2ef536 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -364,7 +364,7 @@ if test "x$ac_cr" = x; then
 fi
 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'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi