freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master f19ab6732: * configure: Don't hardcode `grep -E`.


From: Werner Lemberg
Subject: [freetype2] master f19ab6732: * configure: Don't hardcode `grep -E`.
Date: Sun, 26 Feb 2023 01:32:22 -0500 (EST)

branch: master
commit f19ab673273b33078904f53c29d1a1d837793213
Author: Karl Berry <karl@freefriends.org>
Commit: Werner Lemberg <wl@gnu.org>

    * configure: Don't hardcode `grep -E`.
    
    TeXLive still supports Solaris 5.10, where the system's `grep` doesn't
    accept the `-E` option.  We thus introduce an `EGREP` variable that is set
    to either `grep -E` or `-egrep`.
---
 configure | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 75f8b7bb0..b30e5d475 100755
--- a/configure
+++ b/configure
@@ -15,10 +15,19 @@
 
 rm -f config.mk builds/unix/unix-def.mk builds/unix/unix-cc.mk
 
+if test -z "$EGREP"; then
+  if echo a | grep -E '(a|b)' >/dev/null 2>&1; then
+    EGREP="grep -E"
+  else
+    # if grep -E doesn't work, assume egrep does.
+    EGREP=egrep
+  fi
+fi
+
 # respect GNUMAKE environment variable for backward compatibility
 if test "x$GNUMAKE" = x; then
   if test "x$MAKE" = x; then
-    if test "x`make -v 2>/dev/null | grep -E 'GNU|makepp'`" = x; then
+    if test "x`make -v 2>/dev/null | $EGREP 'GNU|makepp'`" = x; then
       MAKE=gmake
     else
       MAKE=make
@@ -28,7 +37,7 @@ else
   MAKE=$GNUMAKE
 fi
 
-if test "x`$MAKE -v 2>/dev/null | grep -E 'GNU|makepp'`" = x; then
+if test "x`$MAKE -v 2>/dev/null | $EGREP 'GNU|makepp'`" = x; then
   echo "GNU make (>= 3.81) or makepp (>= 2.0) is required to build FreeType2." 
>&2
   echo "Please try" >&2
   echo >&2



reply via email to

[Prev in Thread] Current Thread [Next in Thread]