ChangeLogTag:Tue Mar 25 08:22:03 2003 Ossama Othman <ossama@uci.edu>

4 files changed, 14 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 9a47a91b7cf..e1748f659dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@ Tue Mar 25 08:22:03 2003  Ossama Othman  <ossama@uci.edu>
 	  "$GXX"' instances.  Addresses some problems in non-GNU compiler
 	  builds.
 
+	  Replaced all instances "egrep" with the `configure' script
+	  defined "$EGREP".  This improves the `configure' script's
+	  portability.
+
 Fri Mar 21 23:17:26 2003  Steve Huston  <shuston@riverace.com>
 
 	* configure.ac: Changed <test -n "$GXX"> to <test "$GXX" = yes> to
diff --git a/m4/ace.m4 b/m4/ace.m4
index b9134daf333..7abf1cf87f0 100644
--- a/m4/ace.m4
+++ b/m4/ace.m4
@@ -403,7 +403,7 @@ AC_DEFUN([ACE_COMPILATION_OPTIONS],
       if test "$GXX" = yes; then
 dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
 changequote(, )dnl
-        if $CXX --version | egrep -v '^2\.[0-7]' > /dev/null; then
+        if $CXX --version | $EGREP -v '^2\.[0-7]' > /dev/null; then
 changequote([, ])dnl
           ACE_CXXFLAGS="$ACE_CXXFLAGS -fno-exceptions"
         fi
@@ -423,7 +423,7 @@ dnl
 dnl    if test "$GXX" = yes; then
 dnl dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
 dnl changequote(, )dnl
-dnl      if $CXX --version | egrep -v '^2\.[0-7]' > /dev/null; then
+dnl      if $CXX --version | $EGREP -v '^2\.[0-7]' > /dev/null; then
 dnl changequote([, ])dnl
 dnl        ACE_CXXFLAGS="$ACE_CXXFLAGS -fno-exceptions"
 dnl      fi
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index 17d20df732e..8bda90ecda5 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -347,7 +347,7 @@ EOF
     fi
 
     if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-       egrep "ACE_REAL_FUNCTION" | 
+       $EGREP "ACE_REAL_FUNCTION" | 
        (eval "$AWK '{print \[$]2}' > conftest.awk 2>&1"); then
          rm -f conftest.$ac_ext
          ace_real_function=`cat conftest.awk`
@@ -398,7 +398,7 @@ EOF
     fi
 
     if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-       egrep "ACE_REAL_FUNCTION" |
+       $EGREP "ACE_REAL_FUNCTION" |
        eval "$AWK '{print \[$]2}'" > conftest.awk 2>&1; then
         rm -f conftest.$ac_ext
         ace_real_function=`cat conftest.awk`
@@ -435,7 +435,7 @@ dnl Here we attempt to determine the type of the first argument of
 dnl getrusage from its prototype.  It should either be an int or an
 dnl enum.  If it is an enum, determine the enum type.
      ace_setrlimit_enum=`eval "$ac_cpp conftest.$ac_ext" | \
-       egrep '[ ]+setrlimit.*\(.*[^,]*enum' | \
+       $EGREP '[ ]+setrlimit.*\(.*[^,]*enum' | \
        sed -e 's/^.*setrlimit.*(.*enum//' -e 's/[^ ]*,.*$//'`
 changequote([, ])dnl
 
@@ -478,7 +478,7 @@ dnl Here we attempt to determine the type of the first argument of
 dnl getrusage from its prototype.  It should either be an int or an
 dnl enum.  If it is an enum, determine the enum type.
      ace_rusage_who=`eval "$ac_cpp conftest.$ac_ext" | \
-       egrep '[ ]+getrusage.*\(.*[^,]*enum' | \
+       $EGREP '[ ]+getrusage.*\(.*[^,]*enum' | \
        sed -e 's/^.*getrusage.*(.*enum//' -e 's/[^ ]*,.*$//'`
 changequote([, ])dnl
 
@@ -594,7 +594,7 @@ changequote(, )dnl
 dnl Here we attempt to determine the type of the second argument of
 dnl lseek64()/llseek() from its prototype.
      ace_off64_t=`eval "$ac_cpp conftest.$ac_ext" | \
-       egrep '[ ]+lseek64.*\(.*' | \
+       $EGREP '[ ]+lseek64.*\(.*' | \
        sed -e 's/^.*(.*,[ ]*\(.*\) .*,.*$/\1/'`
 changequote([, ])dnl
 
diff --git a/m4/compiler.m4 b/m4/compiler.m4
index 25458a06e38..e72d81e92ff 100644
--- a/m4/compiler.m4
+++ b/m4/compiler.m4
@@ -40,7 +40,7 @@ dnl  AC_BEFORE([$0], [AM_PROG_LIBTOOL])
  if test "$GXX" = yes; then
 dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
 changequote(, )dnl
-   if $CXX --version | egrep -v '^2\.[0-7]' > /dev/null; then
+   if $CXX --version | $EGREP -v '^2\.[0-7]' > /dev/null; then
 changequote([, ])dnl
      :  # Do nothing
    else
@@ -299,7 +299,7 @@ changequote([, ])dnl
          fi
 
          dnl Some flags only work with Sun C++ 4.2
-         if (CC -V 2>&1 | egrep 'Compilers 4\.2' > /dev/null); then
+         if (CC -V 2>&1 | $EGREP 'Compilers 4\.2' > /dev/null); then
            CXXFLAGS="$CXXFLAGS -features=castop"
            if test "$ace_user_enable_rtti" = yes; then
              CXXFLAGS="$CXXFLAGS -features=rtti"
@@ -307,7 +307,7 @@ changequote([, ])dnl
          fi
 
          dnl Sun C++ 5.0 weirdness
-         if (CC -V 2>&1 | egrep 'Compilers 5\.0' > /dev/null); then
+         if (CC -V 2>&1 | $EGREP 'Compilers 5\.0' > /dev/null); then
            CXXFLAGS="$CXXFLAGS -library=iostream,no%Cstd -instances=explicit"
 
            dnl Inlining appears to cause link problems with early