* ltmain.in (shtool): Use echo|grep instead of expr, as in the

original patch.

diff --git a/ChangeLog b/ChangeLog
index 1d33efc22e8bfd97975763f007394e6b78849cbc..9ccfcd3656054fecaa61c1d508a79b9af85b7705 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-01  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
+
+       * ltmain.in (shtool): Use echo|grep instead of expr, as in the
+       original patch.
+
 2000-08-01  Alexandre Oliva  <aoliva@redhat.com>
 
        * ltcf-c.sh (need_lc): Fix test message.  Set wl for archive_cmds.

diff --git a/ltmain.in b/ltmain.in
index 6ad0e697060f6cd73e1e94a13e11c33c8451880c..dd77b642e6f9f9a0c365ef5805ca74f2af6298f5 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -4023,7 +4023,7 @@ relink_command=\"$relink_command\""
     # install_prog (especially on Windows NT).
     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
        # Allow the use of GNU shtool's install command.
-       expr "X$nonopt" : "X.*shtool.*" > /dev/null; then
+       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
       # Aesthetically quote it.
       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
       case "$arg" in