[PATCH] libtool: Use echo in archive_cmds and archive_expsym_cmds on OS/2

[KO Myung-Hun]

This fixes that building DLLs fails because $ECHO does not work when it
is set to "printf %s\n".

* m4/libtool.m4 (archive_cmds) [os2*]: Replace $ECHO with echo
(archive_expsym_cmds) [os2*]: Likewise.
---
 m4/libtool.m4 | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 7250a20f..f0661c0c 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -5426,17 +5426,17 @@ _LT_EOF
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       shrext_cmds=.dll
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} 
INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-       $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-       $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-       $ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} 
INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+       echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+       echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+       echo EXPORTS >> $output_objdir/$libname.def~
        emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> 
$output_objdir/$libname.def~
        $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs 
$compiler_flags $output_objdir/$libname.def~
        emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY 
${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-       $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-       $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-       $ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} 
INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+       echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+       echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+       echo EXPORTS >> $output_objdir/$libname.def~
        prefix_cmds="$SED"~
        if test EXPORTS = "`$SED 1q $export_symbols`"; then
          prefix_cmds="$prefix_cmds -e 1d";
@@ -6147,17 +6147,17 @@ _LT_EOF
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       shrext_cmds=.dll
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} 
INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-       $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-       $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-       $ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} 
INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+       echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+       echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+       echo EXPORTS >> $output_objdir/$libname.def~
        emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> 
$output_objdir/$libname.def~
        $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs 
$compiler_flags $output_objdir/$libname.def~
        emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY 
${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-       $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-       $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-       $ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} 
INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+       echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+       echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+       echo EXPORTS >> $output_objdir/$libname.def~
        prefix_cmds="$SED"~
        if test EXPORTS = "`$SED 1q $export_symbols`"; then
          prefix_cmds="$prefix_cmds -e 1d";
@@ -7025,17 +7025,17 @@ if test yes != "$_lt_caught_CXX_error"; then
        _LT_TAGVAR(hardcode_minus_L, $1)=yes
        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
        shrext_cmds=.dll
-       _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} 
INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-         $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-         $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-         $ECHO EXPORTS >> $output_objdir/$libname.def~
+       _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} 
INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+         echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+         echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+         echo EXPORTS >> $output_objdir/$libname.def~
          emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> 
$output_objdir/$libname.def~
          $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs 
$compiler_flags $output_objdir/$libname.def~
          emximp -o $lib $output_objdir/$libname.def'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY 
${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-         $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-         $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-         $ECHO EXPORTS >> $output_objdir/$libname.def~
+       _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY 
${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+         echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+         echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+         echo EXPORTS >> $output_objdir/$libname.def~
          prefix_cmds="$SED"~
          if test EXPORTS = "`$SED 1q $export_symbols`"; then
            prefix_cmds="$prefix_cmds -e 1d";
-- 
2.50.1