minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 9 Releases Wiki Activity

* configure: Use egrep, not grep. 

Problem reported Mojca Miklavec <mojca.miklavec.lists@gmail.com>.
This commit is contained in:
Werner Lemberg 2013-03-31 09:04:38 +02:00
parent 94720c2c56
commit 2f7ccb2399
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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>
* include/freetype/ftlcdfil.h: Add description of color filtering.

4
configure vendored
View File

@ -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
if test "x$GNUMAKE" = 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
else
MAKE=make
@ -28,7 +28,7 @@ else
MAKE=$GNUMAKE
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 "Please try" >&2
echo >&2