libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

clcommit (was: libtool ChangeLog libtool.m4 [branch-1-5])


From: Ralf Wildenhues
Subject: clcommit (was: libtool ChangeLog libtool.m4 [branch-1-5])
Date: Mon, 31 Jan 2005 22:11:00 +0100
User-agent: Mutt/1.5.6+20040907i

[ on libtool-commit: ]

* Ralf Wildenhues wrote on Mon, Jan 31, 2005 at 06:32:19PM CET:
> Modified files:
>       .              : ChangeLog libtool.m4 
> 
> Log message:
>       * libtool.m4 (AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): Unicos 9 sed rejects
>       empty parentheses as in 's/x()/1/'.
>       (AC_LIBTOOL_PROG_COMPILER_PIC) [unicos*]: wl=-Wl,.

Looks like clcommit.m4sh eats backspaces, hehe.
Proposed, untested patch below (I don't care too much if they get
eaten, so if your shell does not do `read -r', then so be it).

(We could put in the same for func_extract_an_archive, in case
someone manages to create an archive with paths and then use it
under cygwin -- the creation would have to be done with non-GNU
tools, however, since they don't do those archives.  I don't care.)

Regards,
Ralf

Index: clcommit.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/clcommit.m4sh,v
retrieving revision 1.7
diff -u -r1.7 clcommit.m4sh
--- clcommit.m4sh       28 Dec 2004 13:50:21 -0000      1.7
+++ clcommit.m4sh       31 Jan 2005 21:08:03 -0000
@@ -101,6 +101,14 @@
 sendmail_to=
 exit_cmd=:
 
+# try to find out whether read supports -r
+if echo bt | tr b '\\' | { read -r line; test "X$line" = 'X\t'; } 2>/dev/null
+then
+  read_r='read -r'
+else
+  read_r=read
+fi
+
 # Locations for important files:
 signature_file=
 log_dir="`func_mktempdir`"
@@ -297,7 +305,7 @@
     func_verbose "$progname: checking for conflicts..."
     if $opt_tla; then
       if ( $TLA changes |
-           while read line; do
+           while $read_r line; do
              echo "$line"
              echo "$line" >&3
            done | grep '^C'
@@ -308,7 +316,7 @@
 
     if test -f CVS/Entries; then
       if ( $CVS $cvs_flags -q -n update $update_flags ${1+"$@"} |
-            while read line; do
+            while $read_r line; do
              echo "$line"
              echo "$line" >&3
             done | grep '^C'
@@ -340,7 +348,7 @@
     if $opt_first; then
       skipping=:
       $SED 's,^,+,' < ${ChangeLog-ChangeLog} |
-        while read line; do
+        while $read_r line; do
           case "$line" in
             "+") if $skipping; then skipping=false; else break; fi;;
             "+ "*)
@@ -358,7 +366,7 @@
         cmd="$CVS $cvs_flags diff -u"
       fi
       $cmd ${ChangeLog-ChangeLog} |
-        while read line; do
+        while $read_r line; do
           case $line in
             "--- "*) :;;
             "-"*)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]