From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Tue, 12 Apr 2005 17:28:48 +0000 (+0000)
Subject: * config/general.m4sh, libtool.m4 (_LT_SETUP), tests/defs.m4sh,
X-Git-Tag: release-2-1b~677
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fbecdee168ffe487a70bf84c84c5b5cde44df23;p=thirdparty%2Flibtool.git

* config/general.m4sh, libtool.m4 (_LT_SETUP), tests/defs.m4sh,
tests/functests.at: Fix definition of $Xsed.
---

diff --git a/ChangeLog b/ChangeLog
index d6444b84d..e925d7a38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* config/general.m4sh, libtool.m4 (_LT_SETUP), tests/defs.m4sh,
+	tests/functests.at: Fix definition of $Xsed.
+
 2005-04-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Improved Portland support: prelinking of C++ templates and whole_archive.
diff --git a/config/general.m4sh b/config/general.m4sh
index 534d7b474..76176ed0c 100644
--- a/config/general.m4sh
+++ b/config/general.m4sh
@@ -37,7 +37,7 @@ m4_if([# general.m4sh -- general shell script boiler plate -*- Autoconf -*-
 : ${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
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 34af54117..8f3223975 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -153,7 +153,7 @@ esac
 
 # 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.
diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index 4e84ecf3f..53d04550f 100644
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -34,7 +34,7 @@ m4_include([general.m4sh])
 : ${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.
diff --git a/tests/functests.at b/tests/functests.at
index acd6f2bcc..74993c5aa 100644
--- a/tests/functests.at
+++ b/tests/functests.at
@@ -28,7 +28,7 @@ AT_DATA(func_extract_archives,
 # func_extract_archives
 . ./ltdefs
 SED=${SED-sed}
-Xsed="$SED -e s/^X//"
+Xsed="$SED -e 1s/^X//"
 progname=libtool
 mode=testing