[exim-cvs] Attempt (2) egrep compat for Solaris vs. Linux

Gitweb: https://git.exim.org/exim.git/commitdiff/e1eccd45658e98553dd17fe494176e363aac295a

Commit:     e1eccd45658e98553dd17fe494176e363aac295a
Parent:     7dc8d146a675f52b441310e731314d86c66b2114
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Aug 29 11:15:33 2024 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu Aug 29 11:15:33 2024 +0100

    Attempt (2) egrep compat for Solaris vs. Linux
---
 src/scripts/Configure-Makefile | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile
index 2b8a9bcb5..c3019f846 100755
--- a/src/scripts/Configure-Makefile
+++ b/src/scripts/Configure-Makefile
@@ -29,16 +29,6 @@ fi

archtype=`../scripts/arch-type` || exit 1

-# Linux now whines about egrep, saying "use grep -E".
-# Solarix doesn't support -E on grep. Thanks so much for
-# going non-back-compatible, Linux.
-if echo 1 | grep -E 1 >/dev/null; then
- egrep="grep -E"
-else
- egrep="egrep"
-fi
-
-
# Now test for either the non-existence of Makefile, or for any of its
# components being newer. Note that the "newer" script gives the right
# answer (for our purposes) when the first file is non-existent.
@@ -76,7 +66,7 @@ fi
# Linux now whines about egrep, saying "use grep -E".
# Solarix doesn't support -E on grep. Thanks so much for
# going non-back-compatible, Linux.
-if echo 1 | grep -E 1 >/dev/null; then
+if [ "$ostype" != "SunOS5" ] ; then
egrep="grep -E"
else
egrep="egrep"

--
## subscription configuration (requires account):
## https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/