I've fixed the issues with the first version of the $Xsed killer patch now, with the incremental diff as shown below, and pushed the combined result.
Cheers, Ralf diff --git a/libltdl/config/general.m4sh b/libltdl/config/general.m4sh index ce80241..9fe5873 100644 --- a/libltdl/config/general.m4sh +++ b/libltdl/config/general.m4sh @@ -181,6 +181,13 @@ func_verbose () : } +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + # func_error arg... # Echo program name prefixed message to standard error. func_error () diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 6344729..937f14e 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -4958,7 +4958,7 @@ func_mode_link () echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" - $ECHO "*** because the file extensions .$libext of this argument makes me believe" + echo "*** because the file extensions .$libext of this argument makes me believe" echo "*** that it is just a static archive that I should not use here." else echo diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 1b99f02..633d8f8 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -428,7 +428,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE], # embedded single quotes properly. In configure, this macro expands # each variable declared with _LT_DECL (and _LT_TAGDECL) into: # -# <var>='`$ECHO "$<var>" | $$SED "$delay_single_quote_subst"`' +# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) @@ -1509,7 +1509,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`$ECHO "$teststring$teststring" 2>/dev/null` \ + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do diff --git a/libtoolize.m4sh b/libtoolize.m4sh index f1127d4..1427e61 100644 --- a/libtoolize.m4sh +++ b/libtoolize.m4sh @@ -168,11 +168,11 @@ all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am REA --dry-run|-n) if $opt_dry_run; then :; else opt_dry_run=: - RM="echo $RM" - test -n "$LN_S" && LN_S="echo $LN_S" - CP="echo $CP" - MKDIR="echo $MKDIR" - TAR="echo $TAR" + RM="func_echo_all $RM" + test -n "$LN_S" && LN_S="func_echo_all $LN_S" + CP="func_echo_all $CP" + MKDIR="func_echo_all $MKDIR" + TAR="func_echo_all $TAR" fi ;; @@ -209,7 +209,7 @@ all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am REA # Separate optargs to long options: --*=*) - arg=`$ECHO "$opt" | $SED "$my_sed_long_arg"` + arg=`$ECHO "$opt" | $SED "$my_sed_long_arg"` opt=`$ECHO "$opt" | $SED "$my_sed_long_opt"` set dummy "$opt" "$arg" ${1+"$@"} shift @@ -676,7 +676,7 @@ func_included_files () d' if test -f "$my_searchfile"; then - $ECHO "$my_searchfile" + $ECHO "$my_searchfile" # Only recurse when we don't care if all the variables we use get # trashed, since they are in global scope.