diff options
| author | Nali Toja | 2011-10-25 09:41:26 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-10-25 09:41:26 -0700 |
| commit | d2eaf3e40d0708a16fa48538173ef635ee6a17e0 (patch) | |
| tree | 54a60ae65aeda031c6dfd1e9f75ad82884e80f63 | |
| parent | fe0055fa74c94ba1d3bbdf36cffd3d28ffe95158 (diff) | |
| download | emacs-d2eaf3e40d0708a16fa48538173ef635ee6a17e0.tar.gz emacs-d2eaf3e40d0708a16fa48538173ef635ee6a17e0.zip | |
* configure.in (HAVE_GNU_MAKE): Respect MAKE env-var. (tiny change)
Fixes: debbugs:9868
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 5 insertions, 1 deletions
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-10-25 Nali Toja <nalitoja@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * configure.in (HAVE_GNU_MAKE): Respect MAKE env-var. (Bug#9868) | ||
| 4 | |||
| 1 | 2011-10-24 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2011-10-24 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | * configure.in (LIB_PTHREAD): Prepend -lpthread to LIBS (Bug#9852) | 7 | * configure.in (LIB_PTHREAD): Prepend -lpthread to LIBS (Bug#9852) |
diff --git a/configure.in b/configure.in index 3040c13e683..ab5f74573f0 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -1374,7 +1374,7 @@ dnl check for GNU Make if we have GCC and autodepend is on. | |||
| 1374 | if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then | 1374 | if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then |
| 1375 | AC_MSG_CHECKING([whether we are using GNU Make]) | 1375 | AC_MSG_CHECKING([whether we are using GNU Make]) |
| 1376 | HAVE_GNU_MAKE=no | 1376 | HAVE_GNU_MAKE=no |
| 1377 | testval=`make --version 2>/dev/null | grep 'GNU Make'` | 1377 | testval=`${MAKE-make} --version 2>/dev/null | grep 'GNU Make'` |
| 1378 | if test "x$testval" != x; then | 1378 | if test "x$testval" != x; then |
| 1379 | HAVE_GNU_MAKE=yes | 1379 | HAVE_GNU_MAKE=yes |
| 1380 | else | 1380 | else |