summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron W. LaFramboise <aaronenvelope277@aaronwl.com>2009-03-22 01:06:58 -0500
committerEric Blake <ebb9@byu.net>2009-03-24 06:40:23 -0600
commit60e637d68fd3f8595894e7b8155150893e928069 (patch)
treedf9348dd64fb9f6bd2549d72465860d0ad039f37
parentdbcfd3b29f339ac0ca2f18685258c02b0e45889c (diff)
downloadautoconf-60e637d68fd3f8595894e7b8155150893e928069.tar.gz
Work around cygwin bash igncr mode.
* lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Fall back to bash carriage returns if ac_cr lost \r from ``. * THANKS: Update. Suggested by Eric Blake. Signed-off-by: Eric Blake <ebb9@byu.net>
-rw-r--r--ChangeLog8
-rw-r--r--THANKS1
-rw-r--r--lib/autoconf/status.m46
3 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f6b82e5..6bb006e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-24 Aaron W. LaFramboise <aaronenvelope277@aaronwl.com> (tiny change)
+
+ Work around cygwin bash igncr mode.
+ * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Fall back to
+ bash carriage returns if ac_cr lost \r from ``.
+ * THANKS: Update.
+ Suggested by Eric Blake.
+
2009-03-24 Eric Blake <ebb9@byu.net>
Fix underquoted example in manual.
diff --git a/THANKS b/THANKS
index 6c9da3b..019d9fd 100644
--- a/THANKS
+++ b/THANKS
@@ -9,6 +9,7 @@ contributions significant enough to warrant copyright assignment.
Aaron Crane aaronc@pobox.com
Aaron M. Ucko amu@alum.mit.edu
+Aaron W. LaFramboise aaronenvelope277@aaronwl.com
Adam J. Richter adam@yggdrasil.com
Aharon Robbins arnold@gnu.org
Akim Demaille akim@freefriends.org
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 6e5a904..0e118f2 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -377,6 +377,12 @@ else
ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }'
fi]])
ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+ eval ac_cr=\$\'\\r\'
+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'