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

original patch.

diff --git a/ChangeLog b/ChangeLog
index f47e930d444a8721b1e38647c9ef7915301dd594..df1e1c3a921d11d0749d1a18dbab3f4865075897 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>
 
        * ltconfig.in (need_lc): Fix test message.

diff --git a/ltmain.in b/ltmain.in
index db85810ae3e2b7030944a866c54d1032fa8f0e55..6afa74e1b8ea3511bfa21705e7bee5d621ebaacb 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -3828,7 +3828,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