From: Ralf Wildenhues Date: Sun, 24 Jan 2010 08:33:25 +0000 (+0100) Subject: Fix substitution of carriage return on Darwin. X-Git-Tag: v2.66~86 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2889ee464562b0b91c1bd6dd00d846ce4b022a0;p=thirdparty%2Fautoconf.git 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 --- diff --git a/ChangeLog b/ChangeLog index ec631ffb..18aa1699 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-01-24 Ralf Wildenhues + + 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 Fix test failure when a shell uses $TMPDIR for here-documents. diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4 index 3fddc38b..5988a61c 100644 --- 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` 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