* libltdl/m4/libtool.m4 (_LT_LINKER_OPTION): Require

_LT_DECL_SED.
(_LT_CMD_GLOBAL_SYMBOLS, _LT_LINKER_SHLIBS): Likewise.
* libltdl/m4/ltdl.m4 (LTDL_INIT): Likewise.
(_LT_DECL_SED): Set $Xsed here, using $SED.  Moved from...
(_LT_SETUP): ...here.
Report by Eric Blake.

diff --git a/ChangeLog b/ChangeLog
index 12f6326055d9ff70c56fa7274bd0578e1c382fbe..f1e93ddd874b27eac44201fce3014467e1fcecbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-05-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * libltdl/m4/libtool.m4 (_LT_LINKER_OPTION): Require
+       _LT_DECL_SED.
+       (_LT_CMD_GLOBAL_SYMBOLS, _LT_LINKER_SHLIBS): Likewise.
+       * libltdl/m4/ltdl.m4 (LTDL_INIT): Likewise.
+       (_LT_DECL_SED): Set $Xsed here, using $SED.  Moved from...
+       (_LT_SETUP): ...here.
+       Report by Eric Blake.
+
 2006-05-17  Gary V. Vaughan  <gary@gnu.org>
 
        * doc/libtool.texi (libtool script contents): Document new

diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 56a849685ad376dd54862e40cfd0a434be006e3a..e474837ce9a48c128d3b1a666923b314c1063bfc 100644 (file)
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -181,7 +181,6 @@ esac
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
 sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
 
 # Same as above, but do not quote variable references.
@@ -1308,6 +1307,7 @@ dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
 # Check whether the given linker option works
 AC_DEFUN([_LT_LINKER_OPTION],
 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
    save_LDFLAGS="$LDFLAGS"
@@ -3116,6 +3116,7 @@ AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_OBJEXT])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
 AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
 m4_require([_LT_DECL_EGREP])dnl
 m4_require([_LT_TAG_COMPILER])dnl
 
@@ -3931,6 +3932,7 @@ m4_defun([_LT_LINKER_SHLIBS],
 AC_REQUIRE([LT_PATH_NM])dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
 m4_require([_LT_TAG_COMPILER])dnl
 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
@@ -6796,6 +6798,7 @@ AC_SUBST([GREP])
 m4_defun([_LT_DECL_SED],
 [AC_PROG_SED
 test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
 _LT_DECL([], [SED], [1], [A sed program that does not truncate output])
 _LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
     [Sed that helps us avoid accidentally triggering echo(1) options like -n])

diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
index 76e8732a101fe502ccfa6a021a2fb630f6a68ffd..648fc43ff08d37405d0603d7199edc2227ecb5d9 100644 (file)
--- a/libltdl/m4/ltdl.m4
+++ b/libltdl/m4/ltdl.m4
@@ -255,6 +255,7 @@ AC_REQUIRE([gl_FUNC_ARGZ])dnl
 m4_require([_LT_CHECK_OBJDIR])dnl
 m4_require([_LT_HEADER_DLFCN])dnl
 m4_require([_LT_CHECK_DLPREOPEN])dnl
+m4_require([_LT_DECL_SED])dnl
 
 dnl Don't require this, or it will be expanded earlier than the code
 dnl that sets the variables it relies on: