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 09175a98ba06bb0d50a60a4098ad23543ef5a1c6..e2d1ed1e7ec89c8e4e6d4e1177e4c9572fbadb07 100644 (file)
--- 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 bbcc5f25270180f254138c37f76778ad03fcadc4..86d03f4d86ab6a074679db380fc50bfee35447f0 100644 (file)
--- 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 9486eb85efd729828f9d51723843c5b75f118572..cd9d2a8d5c884d88556829cf1ccd45d8c296782b 100644 (file)
--- 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