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

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

Commit:     e93ae25c007845adff89736d7d292fe75b8a0c7a
Parent:     cccb2c06bbb96fa98edf6867f0eba4059aa757a0
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Aug 29 09:31:44 2024 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu Aug 29 09:31:44 2024 +0100

    Attempt egrep compat for Solaris vs. Linux

    Broken-by: f22117796141
---
 src/scripts/Configure-Makefile | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile
index 427ce0cb7..af0de26e4 100755
--- a/src/scripts/Configure-Makefile
+++ b/src/scripts/Configure-Makefile
@@ -63,6 +63,16 @@ else
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
+ egrep="grep -E"
+else
+ egrep="egrep"
+fi
+
+
# If Makefile is up-to-date, no need to rebuild it.

 if [ $rebuild = no ] ; then
@@ -134,7 +144,7 @@ then
   sed "s/^/PKG_CONFIG_PATH='/" < ./$mftepcp2 | sed "s/\$/'/" > ./$mftepcp
   . ./$mftepcp
   export PKG_CONFIG_PATH
-  grep -E -v "^[$st]*PKG_CONFIG_PATH[$st]*=" ./$mft > ./$mftt
+  $egrep -v "^[$st]*PKG_CONFIG_PATH[$st]*=" ./$mft > ./$mftt
   rm -f ./$mft
   (
     echo "# Collapsed PKG_CONFIG_PATH in build-prep:"
@@ -149,10 +159,10 @@ rm -f ./$mftepcp ./$mftepcp2

# handle pkg-config
# beware portability of extended regexps with sed.
-grep -E "^[$st]*(AUTH|LOOKUP)_[A-Z0-9_]*[$st]*=[$st]*" $mft | \
+$egrep "^[$st]*(AUTH|LOOKUP)_[A-Z0-9_]*[$st]*=[$st]*" $mft | \
sed "s/[$st]*=/='/" | \
sed "s/\$/'/" > $mftt
-grep -E "^[$st]*((USE_(OPENSSL|GNUTLS)_PC)|SUPPORT_TLS|USE_GNUTLS|PCRE2?_CONFIG|AVOID_GNUTLS_PKCS11)[$st]*=[$st]*" $mft | \
+$egrep "^[$st]*((USE_(OPENSSL|GNUTLS)_PC)|SUPPORT_TLS|USE_GNUTLS|PCRE2?_CONFIG|AVOID_GNUTLS_PKCS11)[$st]*=[$st]*" $mft | \
sed "s/[$st]*=/='/" | \
sed "s/\$/'/" >> $mftt
if test -s $mftt

--
## 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/