While working on pending bug reports (hi Robert :)..
I noticed not all Xsed's only strip the first input line. This breaks
$ECHO "X$list" | $SP2NL | $Xsed ...
OK to apply attached patches for consistency? The HEAD one works
against branch-2-0 as well, if you ignore the file from the new HEAD
testsuite.
Regards,
Ralf
* config/general.m4sh, libtool.m4 (_LT_SETUP), tests/defs.m4sh,
tests/functests.at: Fix definition of $Xsed.
Index: config/general.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/config/general.m4sh,v
retrieving revision 1.15
diff -u -r1.15 general.m4sh
--- config/general.m4sh 16 Mar 2005 17:27:35 -0000 1.15
+++ config/general.m4sh 9 Apr 2005 14:47:12 -0000
@@ -37,7 +37,7 @@
: ${RM="rm -f"}
: ${SED="@SED@"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e s/^X//"}
+: ${Xsed="$SED -e 1s/^X//"}
# Global variables:
EXIT_SUCCESS=0
Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.180
diff -u -r1.180 libtool.m4
--- m4/libtool.m4 7 Apr 2005 17:58:26 -0000 1.180
+++ m4/libtool.m4 9 Apr 2005 14:47:18 -0000
@@ -153,7 +153,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
# Same as above, but do not quote variable references.
Index: tests/defs.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/defs.m4sh,v
retrieving revision 1.8
diff -u -r1.8 defs.m4sh
--- tests/defs.m4sh 18 Mar 2005 15:57:17 -0000 1.8
+++ tests/defs.m4sh 9 Apr 2005 14:47:18 -0000
@@ -34,7 +34,7 @@
: ${LIBTOOL="../libtool"}
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
+Xsed="$SED -e 1s/^X//"
# Disable usage of config.site for autoconf, unless DJGPP is present.
# The DJGPP port of autoconf requires config.site, to work correctly.
Index: tests/functests.at
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/functests.at,v
retrieving revision 1.2
diff -u -r1.2 functests.at
--- tests/functests.at 21 Feb 2005 13:47:45 -0000 1.2
+++ tests/functests.at 9 Apr 2005 14:47:18 -0000
@@ -28,7 +28,7 @@
# func_extract_archives
. ./ltdefs
SED=${SED-sed}
-Xsed="$SED -e s/^X//"
+Xsed="$SED -e 1s/^X//"
progname=libtool
mode=testing
* libtool.m4 (AC_LIBTOOL_SETUP, AC_LIBTOOL_CONFIG): Fix
definition of $Xsed.
Index: libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/libtool.m4,v
retrieving revision 1.314.2.78
diff -u -r1.314.2.78 libtool.m4
--- libtool.m4 1 Apr 2005 09:29:32 -0000 1.314.2.78
+++ libtool.m4 9 Apr 2005 14:42:54 -0000
@@ -117,7 +117,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
@@ -4022,7 +4022,7 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
+Xsed="$SED -e 1s/^X//"
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
