Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
f19ab673
by Karl Berry at 2023-02-26T07:31:49+01:00
1 changed file:
Changes:
... | ... | @@ -15,10 +15,19 @@ |
15 | 15 | |
16 | 16 | rm -f config.mk builds/unix/unix-def.mk builds/unix/unix-cc.mk
|
17 | 17 | |
18 | +if test -z "$EGREP"; then
|
|
19 | + if echo a | grep -E '(a|b)' >/dev/null 2>&1; then
|
|
20 | + EGREP="grep -E"
|
|
21 | + else
|
|
22 | + # if grep -E doesn't work, assume egrep does.
|
|
23 | + EGREP=egrep
|
|
24 | + fi
|
|
25 | +fi
|
|
26 | + |
|
18 | 27 | # respect GNUMAKE environment variable for backward compatibility
|
19 | 28 | if test "x$GNUMAKE" = x; then
|
20 | 29 | if test "x$MAKE" = x; then
|
21 | - if test "x`make -v 2>/dev/null | grep -E 'GNU|makepp'`" = x; then
|
|
30 | + if test "x`make -v 2>/dev/null | $EGREP 'GNU|makepp'`" = x; then
|
|
22 | 31 | MAKE=gmake
|
23 | 32 | else
|
24 | 33 | MAKE=make
|
... | ... | @@ -28,7 +37,7 @@ else |
28 | 37 | MAKE=$GNUMAKE
|
29 | 38 | fi
|
30 | 39 | |
31 | -if test "x`$MAKE -v 2>/dev/null | grep -E 'GNU|makepp'`" = x; then
|
|
40 | +if test "x`$MAKE -v 2>/dev/null | $EGREP 'GNU|makepp'`" = x; then
|
|
32 | 41 | echo "GNU make (>= 3.81) or makepp (>= 2.0) is required to build FreeType2." >&2
|
33 | 42 | echo "Please try" >&2
|
34 | 43 | echo >&2
|