* configure: Use egrep, not grep.
Problem reported Mojca Miklavec <mojca.miklavec.lists@gmail.com>.
This commit is contained in:
parent
94720c2c56
commit
2f7ccb2399
|
@ -1,3 +1,9 @@
|
||||||
|
2013-03-31 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
* configure: Use egrep, not grep.
|
||||||
|
|
||||||
|
Problem reported Mojca Miklavec <mojca.miklavec.lists@gmail.com>.
|
||||||
|
|
||||||
2013-03-29 Werner Lemberg <wl@gnu.org>
|
2013-03-29 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
* include/freetype/ftlcdfil.h: Add description of color filtering.
|
* include/freetype/ftlcdfil.h: Add description of color filtering.
|
||||||
|
|
|
@ -18,7 +18,7 @@ rm -f config.mk builds/unix/unix-def.mk builds/unix/unix-cc.mk
|
||||||
# respect GNUMAKE environment variable for backwards compatibility
|
# respect GNUMAKE environment variable for backwards compatibility
|
||||||
if test "x$GNUMAKE" = x; then
|
if test "x$GNUMAKE" = x; then
|
||||||
if test "x$MAKE" = x; then
|
if test "x$MAKE" = x; then
|
||||||
if test "x`make -v 2>/dev/null | grep '\(GNU\|makepp\)'`" = x; then
|
if test "x`make -v 2>/dev/null | egrep 'GNU|makepp'`" = x; then
|
||||||
MAKE=gmake
|
MAKE=gmake
|
||||||
else
|
else
|
||||||
MAKE=make
|
MAKE=make
|
||||||
|
@ -28,7 +28,7 @@ else
|
||||||
MAKE=$GNUMAKE
|
MAKE=$GNUMAKE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x`$MAKE -v 2>/dev/null | grep '\(GNU\|makepp\)'`" = x; then
|
if test "x`$MAKE -v 2>/dev/null | egrep 'GNU|makepp'`" = x; then
|
||||||
echo "GNU make (>= 3.80) or makepp (>= 1.19) is required to build FreeType2." >&2
|
echo "GNU make (>= 3.80) or makepp (>= 1.19) is required to build FreeType2." >&2
|
||||||
echo "Please try" >&2
|
echo "Please try" >&2
|
||||||
echo >&2
|
echo >&2
|
||||||
|
|
Loading…
Reference in New Issue