Commit 39d7307f3f3531638c5dee09e2eeff8340362d3f
1 parent
b389268f
autoconf: find gnu make as gmake or make (fixes #75)
Showing
1 changed file
with
19 additions
and
12 deletions
configure.ac
| ... | ... | @@ -153,23 +153,30 @@ else |
| 153 | 153 | fi |
| 154 | 154 | AC_SUBST(HAVE_LD_VERSION_SCRIPT) |
| 155 | 155 | |
| 156 | -AC_MSG_CHECKING(for gnu make >= 3.81) | |
| 157 | 156 | make_okay=0 |
| 158 | -if make --version >/dev/null 2>&1; then | |
| 159 | - v=`make --version | grep 'GNU Make' | sed -e 's/.*Make //'` | |
| 160 | - maj=`echo $v | cut -d. -f 1` | |
| 161 | - min=`echo $v | cut -d. -f 2` | |
| 162 | - if test $maj -gt 3 -o '(' $maj -eq 3 -a $min -ge 81 ')'; then | |
| 163 | - make_okay=1 | |
| 157 | +for make_prog in make gmake; do | |
| 158 | + this_make_okay=0 | |
| 159 | + AC_MSG_CHECKING(for gnu make >= 3.81 ($make_prog)) | |
| 160 | + if $make_prog --version >/dev/null 2>&1; then | |
| 161 | + v=`$make_prog --version | grep 'GNU Make' | sed -e 's/.*Make //'` | |
| 162 | + maj=`echo $v | cut -d. -f 1` | |
| 163 | + min=`echo $v | cut -d. -f 2` | |
| 164 | + if test $maj -gt 3 -o '(' $maj -eq 3 -a $min -ge 81 ')'; then | |
| 165 | + this_make_okay=1 | |
| 166 | + make_okay=1 | |
| 167 | + fi | |
| 164 | 168 | fi |
| 165 | -fi | |
| 166 | -if test "$make_okay" = "1"; then | |
| 167 | - AC_MSG_RESULT(yes) | |
| 168 | -else | |
| 169 | + if test "$this_make_okay" = "1"; then | |
| 170 | + AC_MSG_RESULT(yes) | |
| 171 | + else | |
| 172 | + AC_MSG_RESULT(no) | |
| 173 | + fi | |
| 174 | +done | |
| 175 | + | |
| 176 | +if test "$make_okay" = "0"; then | |
| 169 | 177 | dnl Don't set MISSING_ANY=1 -- maybe user calls make something else |
| 170 | 178 | MISSING_MAKE_381=1 |
| 171 | 179 | ISSUE_WARNINGS=1 |
| 172 | - AC_MSG_RESULT(no) | |
| 173 | 180 | fi |
| 174 | 181 | |
| 175 | 182 | AC_SUBST(GENDEPS) | ... | ... |