texlive[66406]

[commits+karl at tug.org]

Revision: 66406
          http://tug.org/svn/texlive?view=revision&revision=66406
Author:   karl
Date:     2023-03-06 23:58:37 +0100 (Mon, 06 Mar 2023)
Log Message:
-----------
copy egrep vs. grep -E for freetype to branch

Modified Paths:
--------------
    branches/branch2022.final/Build/source/libs/freetype2/freetype-src/configure

Modified: branches/branch2022.final/Build/source/libs/freetype2/freetype-src/configure
===================================================================
--- branches/branch2022.final/Build/source/libs/freetype2/freetype-src/configure	2023-03-06 22:36:26 UTC (rev 66405)
+++ branches/branch2022.final/Build/source/libs/freetype2/freetype-src/configure	2023-03-06 22:58:37 UTC (rev 66406)
@@ -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 @@
   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