diff options
| author | Glenn Morris | 2014-06-10 20:33:34 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-06-10 20:33:34 -0700 |
| commit | 6014484659f81b35f7e6340aaf5c71ffc1fca342 (patch) | |
| tree | b5912a346dd62f3ba592be0a4bc3ecb2b7f403b7 | |
| parent | b12e56ab01d5d1ed71190d5fbffc15017f96fe40 (diff) | |
| download | emacs-6014484659f81b35f7e6340aaf5c71ffc1fca342.tar.gz emacs-6014484659f81b35f7e6340aaf5c71ffc1fca342.zip | |
* configure.ac: Tweak previous change, for make 10+
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index aa17bf55194..07221b0e235 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -98,7 +98,7 @@ AC_CACHE_CHECK([for GNU Make], [ac_cv_path_MAKE], | |||
| 98 | if test -n "$MAKE"; then | 98 | if test -n "$MAKE"; then |
| 99 | emacs_makeout=`($MAKE --version) 2>/dev/null` && | 99 | emacs_makeout=`($MAKE --version) 2>/dev/null` && |
| 100 | case $emacs_makeout in | 100 | case $emacs_makeout in |
| 101 | 'GNU Make '[[4-9]]* | 'GNU Make '3.8[[1-9]]* | 'GNU Make '3.9*) | 101 | 'GNU Make '[[1-3]][[0-9]]* | 'GNU Make '[[4-9]]* | 'GNU Make '3.8[[1-9]]* | 'GNU Make '3.9*) |
| 102 | ac_path_MAKE_found=:;; | 102 | ac_path_MAKE_found=:;; |
| 103 | esac | 103 | esac |
| 104 | ac_cv_path_MAKE=$MAKE | 104 | ac_cv_path_MAKE=$MAKE |
| @@ -109,7 +109,7 @@ AC_CACHE_CHECK([for GNU Make], [ac_cv_path_MAKE], | |||
| 109 | AC_PATH_PROGS_FEATURE_CHECK([MAKE], [make gmake gnumake], | 109 | AC_PATH_PROGS_FEATURE_CHECK([MAKE], [make gmake gnumake], |
| 110 | [[emacs_makeout=`($ac_path_MAKE --version) 2>/dev/null` && | 110 | [[emacs_makeout=`($ac_path_MAKE --version) 2>/dev/null` && |
| 111 | case $emacs_makeout in | 111 | case $emacs_makeout in |
| 112 | 'GNU Make '[4-9]* | 'GNU Make '3.8[1-9]* | 'GNU Make '3.9*) | 112 | 'GNU Make '[1-3][0-9]* | 'GNU Make '[4-9]* | 'GNU Make '3.8[1-9]* | 'GNU Make '3.9*) |
| 113 | # Use the fully-qualified program name only if the basename | 113 | # Use the fully-qualified program name only if the basename |
| 114 | # would not resolve to it. | 114 | # would not resolve to it. |
| 115 | if eval \$emacs_tried_$ac_prog; then | 115 | if eval \$emacs_tried_$ac_prog; then |