aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2017-07-29 16:48:12 +0200
committerJay Berkenbilt <ejb@ql.org>2017-07-29 18:19:04 +0200
commit39d7307f3f3531638c5dee09e2eeff8340362d3f (patch)
treea8eddc10654006cef93939078dc6737062ada1cb /configure.ac
parentb389268f16fcd571bbc57ef848caba25490a1b86 (diff)
downloadqpdf-39d7307f3f3531638c5dee09e2eeff8340362d3f.tar.zst
autoconf: find gnu make as gmake or make (fixes #75)
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac31
1 files changed, 19 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index 9cf89aa2..f9c0f6a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,23 +153,30 @@ else
fi
AC_SUBST(HAVE_LD_VERSION_SCRIPT)
-AC_MSG_CHECKING(for gnu make >= 3.81)
make_okay=0
-if make --version >/dev/null 2>&1; then
- v=`make --version | grep 'GNU Make' | sed -e 's/.*Make //'`
- maj=`echo $v | cut -d. -f 1`
- min=`echo $v | cut -d. -f 2`
- if test $maj -gt 3 -o '(' $maj -eq 3 -a $min -ge 81 ')'; then
- make_okay=1
+for make_prog in make gmake; do
+ this_make_okay=0
+ AC_MSG_CHECKING(for gnu make >= 3.81 ($make_prog))
+ if $make_prog --version >/dev/null 2>&1; then
+ v=`$make_prog --version | grep 'GNU Make' | sed -e 's/.*Make //'`
+ maj=`echo $v | cut -d. -f 1`
+ min=`echo $v | cut -d. -f 2`
+ if test $maj -gt 3 -o '(' $maj -eq 3 -a $min -ge 81 ')'; then
+ this_make_okay=1
+ make_okay=1
+ fi
fi
-fi
-if test "$make_okay" = "1"; then
- AC_MSG_RESULT(yes)
-else
+ if test "$this_make_okay" = "1"; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+done
+
+if test "$make_okay" = "0"; then
dnl Don't set MISSING_ANY=1 -- maybe user calls make something else
MISSING_MAKE_381=1
ISSUE_WARNINGS=1
- AC_MSG_RESULT(no)
fi
AC_SUBST(GENDEPS)