* config/general.m4sh, libtool.m4 (_LT_SETUP), tests/defs.m4sh,

tests/functests.at: Fix definition of $Xsed.

diff --git a/ChangeLog b/ChangeLog
index d6444b84db0da6336580be01dc47d2ddba0813c6..e925d7a3848c8a8c1d185a5d8ff4ef8d2afb4aea 100644 (file)
--- 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 534d7b474ab8460b7d322f65395012f1f87fb124..76176ed0c917090a5edac4b07a2ecfb66ef2733d 100644 (file)
--- 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 34af54117e855323d24960b41a97d5ca3b6d44a7..8f32239751dbcbfb558b3ceaf175015432b4f701 100644 (file)
--- 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 4e84ecf3ff9ddc122190bdb681cb11ce3be542c4..53d04550f73aada5680373406e228d7ad3da7a7c 100644 (file)
--- 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 acd6f2bcc1cf39b1826d4ab5883f7ff77662f636..74993c5aa0d4298bb4d13143ede26bc13d1d7cc4 100644 (file)
--- 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