[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] apodtele-master-patch-95104 5c37b6406: * configure: Use `sed
From: |
Werner Lemberg |
Subject: |
[freetype2] apodtele-master-patch-95104 5c37b6406: * configure: Use `sed` instead of `grep`. |
Date: |
Thu, 2 Mar 2023 15:53:34 -0500 (EST) |
branch: apodtele-master-patch-95104
commit 5c37b6406258ec0d7ab64b8619c5ea2c19e3c69a
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>
* configure: Use `sed` instead of `grep`.
This is more portable and consistent with `autogen.sh`.
---
configure | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index b30e5d475..d4315bd97 100755
--- a/configure
+++ b/configure
@@ -15,19 +15,10 @@
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 | $EGREP 'GNU|makepp'`" = x; then
+ if test "x`make -v 2>/dev/null | sed -n -e '/GNU/p' -e '/makepp/p'`" = x;
then
MAKE=gmake
else
MAKE=make
@@ -37,7 +28,7 @@ else
MAKE=$GNUMAKE
fi
-if test "x`$MAKE -v 2>/dev/null | $EGREP 'GNU|makepp'`" = x; then
+if test "x`$MAKE -v 2>/dev/null | sed -n -e '/GNU/p' -e '/makepp/p'`" = x; then
echo "GNU make (>= 3.81) or makepp (>= 2.0) is required to build FreeType2."
>&2
echo "Please try" >&2
echo >&2
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] apodtele-master-patch-95104 5c37b6406: * configure: Use `sed` instead of `grep`.,
Werner Lemberg <=