rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* configure: Automatically test for `gmake' also. 

Suggested by Mojca Miklavec <mojca.miklavec.lists@gmail.com>.
This commit is contained in:
Werner Lemberg 2013-03-21 22:58:28 +01:00
parent 63463b93bc
commit eb624d7c17
2 changed files with 21 additions and 13 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-21 Werner Lemberg <wl@gnu.org>
* configure: Automatically test for `gmake' also.
Suggested by Mojca Miklavec <mojca.miklavec.lists@gmail.com>.
2013-03-21 Peter Breitenlohner <peb@mppmu.mpg.de>
Respect CONFIG_SHELL from the environment.

28
configure vendored
View File

@ -18,24 +18,26 @@ 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
MAKE=make
if test "x`make -v 2>/dev/null | grep '\(GNU\|makepp\)'`" = x; then
MAKE=gmake
else
MAKE=make
fi
fi
else
MAKE=$GNUMAKE
fi
if test -z "`$MAKE -v 2>/dev/null | grep GNU`"; then
if test -z "`$MAKE -v 2>/dev/null | grep makepp`"; then
echo "GNU make (>= 3.80) or makepp (>= 1.19) is required to build FreeType2." >&2
echo "Please try" >&2
echo >&2
echo " MAKE=<GNU make command name> $0" >&2
echo >&2
echo "or" >&2
echo >&2
echo " MAKE=\"makepp --norc-substitution\" $0" >&2
exit 1
fi
if test "x`$MAKE -v 2>/dev/null | grep '\(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
echo " MAKE=<GNU make command name> $0" >&2
echo >&2
echo "or" >&2
echo >&2
echo " MAKE=\"makepp --norc-substitution\" $0" >&2
exit 1
fi
# Get `dirname' functionality. This is taken and adapted from autoconf's