[SCM] GNU Autoconf source repository branch, master, updated. v2.63-296-gbc9bc82

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=bc9bc82a1e5615c6a7bca8bb9800427ac73625ce

The branch, master has been updated
       via  bc9bc82a1e5615c6a7bca8bb9800427ac73625ce (commit)
       via  60e637d68fd3f8595894e7b8155150893e928069 (commit)
      from  dbcfd3b29f339ac0ca2f18685258c02b0e45889c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bc9bc82a1e5615c6a7bca8bb9800427ac73625ce
Author: Andris Pavenis <address@hidden>
Date:   Tue Mar 24 06:47:09 2009 -0600

    Fix awk substitution of carriage returns on DJGPP.
    
    * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Fix typo in
    generation of ac_cs_awk_cr.
    * THANKS: Update.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 60e637d68fd3f8595894e7b8155150893e928069
Author: Aaron W. LaFramboise <address@hidden>
Date:   Sun Mar 22 01:06:58 2009 -0500

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

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog              |   15 +++++++++++++++
 THANKS                 |    2 ++
 lib/autoconf/status.m4 |    8 +++++++-
 3 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f6b82e5..b565525 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2009-03-24  Andris Pavenis  <address@hidden>  (tiny change)
+
+       Fix awk substitution of carriage returns on DJGPP.
+       * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Fix typo in
+       generation of ac_cs_awk_cr.
+       * THANKS: Update.
+
+2009-03-24  Aaron W. LaFramboise  <address@hidden>  (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  <address@hidden>
 
        Fix underquoted example in manual.
diff --git a/THANKS b/THANKS
index 6c9da3b..77da1dd 100644
--- a/THANKS
+++ b/THANKS
@@ -9,6 +9,7 @@ contributions significant enough to warrant copyright 
assignment.
 
 Aaron Crane                 address@hidden
 Aaron M. Ucko               address@hidden
+Aaron W. LaFramboise        address@hidden
 Adam J. Richter             address@hidden
 Aharon Robbins              address@hidden
 Akim Demaille               address@hidden
@@ -33,6 +34,7 @@ Andrej Borsenkow            address@hidden
 Andrew Belov                ?
 Andrew Church               address@hidden
 Andrey Simonenko            address@hidden
+Andris Pavenis              address@hidden
 Anthony N. Frasso           address@hidden
 Art Haas                    address@hidden
 Arto C. Nirkko              ?
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 6e5a904..72e6893 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -377,9 +377,15 @@ 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'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi


hooks/post-receive
--
GNU Autoconf source repository