From: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
Date: Tue, 1 Aug 2000 04:27:17 +0000 (+0000)
Subject: * ltmain.in (shtool): Use echo|grep instead of expr, as in the
X-Git-Tag: multi-language-merge-point~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56a4c2b316eefed9b772a0b532ade333b70db186;p=thirdparty%2Flibtool.git

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

diff --git a/ChangeLog b/ChangeLog
index 1d33efc22..9ccfcd365 100644
--- 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 6ad0e6970..dd77b642e 100644
--- 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