mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-03-01 14:16:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix substitution of carriage return on Darwin.

Browse Source 
* 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>
This commit is contained in:
Ralf Wildenhues 2010-01-24 09:33:25 +01:00
parent 7dbbe5693d
commit a2889ee464
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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.

2
lib/autoconf/status.m4
View File

@ -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