summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2004-04-13 08:35:05 +0000
committerWerner Lemberg <wl@gnu.org>2004-04-13 08:35:05 +0000
commit26eccb409f451916336eaebb95a7551eda35070b (patch)
treeebbd984934dc4eab20843bd75eb379236f0466c6 /configure
parent497cc7c4bfa1a5eb1a08d81242848afc0a1c4624 (diff)
downloadfreetype2-26eccb409f451916336eaebb95a7551eda35070b.tar.gz
* configure: Accept makepp also.
* builds/unix/detect.mk: Use proper path to unix-def.mk. * builds/unix/unix-def.in (BUILD_DIR, PLATFORM): Remove. * builds/unix/unix.mk (BUILD_DIR, PLATFORM): Define. Use BUILD_DIR. * docs/INSTALL, docs/INSTALL.GNU, docs/INSTALL.UNX: Update documentation on makepp.
Diffstat (limited to 'configure')
-rw-r--r--configure12
1 files changed, 8 insertions, 4 deletions
diff --git a/configure b/configure
index c8a56577d..8621c0e5a 100644
--- a/configure
+++ b/configure
@@ -5,7 +5,6 @@
# This should re-generate the following files:
#
# config.mk
-# Jamfile
# install
#
@@ -14,9 +13,14 @@ if test "x$GNUMAKE" = x; then
fi
if test -z "`$GNUMAKE -v 2>/dev/null | grep GNU`"; then
- echo "Sorry, GNU make is required to build FreeType2." >&2
- echo "Please try \`GNUMAKE=<GNU make command name> $0'." >&2
- exit 1
+ if test -z "`$GNUMAKE -v 2>/dev/null | grep makepp`"; then
+ echo "GNU make (>= 3.79.1) or makepp (>= 1.19) is required to build FreeType2." >&2
+ echo "Please try" >&2
+ echo " \`GNUMAKE=<GNU make command name> $0'." >&2
+ echo "or >&2"
+ echo " \`GNUMAKE=\"makepp --norc-substitution\" $0'." >&2
+ exit 1
+ fi
fi
# Uh, oh. This is taken from autoconf. They know what they are doing...