From: Paul Eggert <eggert@twinsun.com>
Date: Tue, 3 Feb 2004 19:55:29 +0000 (+0000)
Subject: Scott James Remnant  <scott@netsplit.com>
X-Git-Tag: release-1-5-4~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d70b4e8572c5bfa53909cec0eac5b5298f599d9f;p=thirdparty%2Flibtool.git

Scott James Remnant  <scott@netsplit.com>

* libtool.m4 (_LT_AC_LANG_CXX_CONFIG, AC_LIBTOOL_PROG_LD_SHLIBS):
Replace needless uses of egrep with grep as egrep may not exist,
POSIX no longer mandates it.
* ltmain.in: Replace use of 'grep -E' with '$EGREP -e' in case
egrep is the only thing that exists.
---

diff --git a/ChangeLog b/ChangeLog
index 09175a98b..e2d1ed1e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-03  Paul Eggert  <eggert@twinsun.com>
+	Scott James Remnant  <scott@netsplit.com>
+
+	* libtool.m4 (_LT_AC_LANG_CXX_CONFIG, AC_LIBTOOL_PROG_LD_SHLIBS):
+	Replace needless uses of egrep with grep as egrep may not exist,
+	POSIX no longer mandates it.
+	* ltmain.in: Replace use of 'grep -E' with '$EGREP -e' in case
+	egrep is the only thing that exists.
+
 2004-01-27  Scott James Remnant  <scott@netsplit.com>
 
 	This fixes release procedure problems discovered whilst making
diff --git a/libtool.m4 b/libtool.m4
index bbcc5f252..86d03f4d8 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -2996,7 +2996,7 @@ case $host_os in
       # explicitly linking system object files so we need to strip them
       # from the output so that they don't get included in the library
       # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
       ;;
     *)
       if test "$GXX" = yes; then
@@ -5170,7 +5170,7 @@ EOF
       ;;
 
   linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
       supports_anon_versioning=no
diff --git a/ltmain.in b/ltmain.in
index 9486eb85e..cd9d2a8d5 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -131,7 +131,7 @@ win32_libid () {
     ;;
   *ar\ archive*) # could be an import, or static
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
 	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
       if test "X$win32_nmres" = "Ximport" ; then