* 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.

diff --git a/ChangeLog b/ChangeLog
index 480acfe54dc87e978a41a1e146c4eeb8a4452c85..a6b7a1b94d31a0376f9cebb635b3ac26fae6b6a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-11  Glenn Morris  <rgm@gnu.org>
+
+       * configure.ac: Require at least version 3.81 of GNU make.
+
 2014-06-10  Paul Eggert  <eggert@cs.ucla.edu>
 
        Rely on AC_CANONICAL_HOST to detect whether we're using mingw.

diff --git a/configure.ac b/configure.ac
index 4b1e2a057e5713318e8720b88383c1973549fff6..aa17bf55194c80175c7f49e7e511420cbd86e767 100644 (file)
--- 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'.]])
 }

diff --git a/etc/NEWS b/etc/NEWS
index cfda70f62a8ca6054e64e2569f53d36c8e458ebf..990d3269115d8d0276ca6f31a01493b3f1d5ce72 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -27,7 +27,7 @@ otherwise leave it unmarked.
 +++
 ** Building Emacs now requires C99 or later.
 
-** Building Emacs now requires GNU make.
+** Building Emacs now requires GNU make, version 3.81 or later.
 
 ** By default, Emacs no longer works on IRIX.  We expect that Emacs
 users are not affected by this, as SGI stopped supporting IRIX in