diff options
| author | Glenn Morris <[email protected]> | 2014-06-10 20:03:40 -0700 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2014-06-10 20:03:40 -0700 |
| commit | b12e56ab01d5d1ed71190d5fbffc15017f96fe40 (patch) | |
| tree | 440e0b89b086ce7b0c0fc7f514de55e756184941 /configure.ac | |
| parent | ec4a33476e4aa6eba3a13fca34ad157fec3d8b97 (diff) | |
* configure.ac: Require at least version 3.81 of GNU make.
It's 8 years old and has some useful features not in older versions.
* etc/NEWS: Mention this.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 4b1e2a057e..aa17bf5519 100644 --- a/configure.ac +++ b/configure.ac @@ -98,7 +98,7 @@ AC_CACHE_CHECK([for GNU Make], [ac_cv_path_MAKE], if test -n "$MAKE"; then emacs_makeout=`($MAKE --version) 2>/dev/null` && case $emacs_makeout in - 'GNU Make '*) + 'GNU Make '[[4-9]]* | 'GNU Make '3.8[[1-9]]* | 'GNU Make '3.9*) ac_path_MAKE_found=:;; esac ac_cv_path_MAKE=$MAKE @@ -109,7 +109,7 @@ AC_CACHE_CHECK([for GNU Make], [ac_cv_path_MAKE], AC_PATH_PROGS_FEATURE_CHECK([MAKE], [make gmake gnumake], [[emacs_makeout=`($ac_path_MAKE --version) 2>/dev/null` && case $emacs_makeout in - 'GNU Make '*) + 'GNU Make '[4-9]* | 'GNU Make '3.8[1-9]* | 'GNU Make '3.9*) # Use the fully-qualified program name only if the basename # would not resolve to it. if eval \$emacs_tried_$ac_prog; then @@ -121,7 +121,8 @@ AC_CACHE_CHECK([for GNU Make], [ac_cv_path_MAKE], esac eval emacs_tried_$ac_prog=:]]) fi]) -$ac_path_MAKE_found || { AC_MSG_ERROR([[Building Emacs requires GNU Make. +$ac_path_MAKE_found || { +AC_MSG_ERROR([[Building Emacs requires GNU Make, at least version 3.81. If you have it installed under another name, configure with 'MAKE=...'. For example, run '$0 MAKE=gnu-make'.]]) } |