]>
Commit | Line | Data |
---|---|---|
612c14d5 MT |
1 | From 28d708c44bc47b56f6551ff285f78edcf61c208a Mon Sep 17 00:00:00 2001 |
2 | From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | |
3 | Date: Thu, 31 Oct 2013 12:37:50 +1000 | |
4 | Subject: Accept make versions 4.0 and greater | |
5 | ||
6 | ||
7 | diff --git a/configure b/configure | |
8 | index f382138..5e61abd 100755 | |
9 | --- a/configure | |
10 | +++ b/configure | |
11 | @@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; } | |
12 | ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` | |
13 | case $ac_prog_version in | |
14 | '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; | |
15 | - 3.79* | 3.[89]*) | |
16 | + 3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*) | |
17 | ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; | |
18 | *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; | |
19 | ||
20 | diff --git a/configure.in b/configure.in | |
21 | index 49b70fd..6da8efd 100644 | |
22 | --- a/configure.in | |
23 | +++ b/configure.in | |
24 | @@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v, | |
25 | critic_missing="$critic_missing gcc") | |
26 | AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version, | |
27 | [GNU Make[^0-9]*\([0-9][0-9.]*\)], | |
28 | - [3.79* | 3.[89]*], critic_missing="$critic_missing make") | |
29 | + [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make") | |
30 | ||
31 | AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version, | |
32 | [GNU gettext.* \([0-9]*\.[0-9.]*\)], | |
33 | -- | |
34 | cgit v0.10.2 | |
35 |