diff options
author | Werner Lemberg <wl@gnu.org> | 2013-03-21 22:58:28 +0100 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2013-03-21 22:58:28 +0100 |
commit | eb624d7c1726a773ffd46238d7acc73f8cb2d9b7 (patch) | |
tree | c3eb924bb6060c7b84f8ab55d68a7869662b93df /configure | |
parent | 63463b93bc5f08a60a276949cd644160d16cead6 (diff) | |
download | freetype2-eb624d7c1726a773ffd46238d7acc73f8cb2d9b7.tar.gz |
* configure: Automatically test for `gmake' also.
Suggested by Mojca Miklavec <mojca.miklavec.lists@gmail.com>.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 28 |
1 files changed, 15 insertions, 13 deletions
@@ -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 |