Accept make versions 4.0 and greater

diff --git a/ChangeLog b/ChangeLog
index 4d7a9513c7a61fc8663125cd791277df03801303..56736937f1d2bc339654f9d056ca99a6f57e3f56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-31  Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+
+       [BZ #16037]
+       * configure.ac: allow GNU Make 4.0 and greater.
+       * configure: Regenerated.
+
 2013-10-30  Will Newton  <will.newton@linaro.org>
 
        [BZ #16038]

diff --git a/NEWS b/NEWS
index 273f93515213631dea842b4433ef804c6b5389f2..e3330fcf6b72d4b7a0758fc208a02bb1db59fe02 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,7 @@ Version 2.19
   15754, 15760, 15764, 15797, 15799, 15825, 15844, 15847, 15849, 15855,
   15856, 15857, 15859, 15867, 15886, 15887, 15890, 15892, 15893, 15895,
   15897, 15905, 15909, 15919, 15921, 15923, 15939, 15948, 15963, 15966,
-  15988, 16032, 16034, 16036, 16041, 16071, 16072, 16074, 16078.
+  15988, 16032, 16034, 16036, 16037, 16041, 16071, 16072, 16074, 16078.
 
 * CVE-2012-4412 The strcoll implementation caches indices and rules for
   large collation sequences to optimize multiple passes.  This cache

diff --git a/configure b/configure
index f382138352593a73ad23dae54fc6b1f10ddf3ee5..5e61abd83aba1a4dc301d94add717579b23dd4ae 100755 (executable)
--- a/configure
+++ b/configure
@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
   ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
   case $ac_prog_version in
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-    3.79* | 3.[89]*)
+    3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
 

diff --git a/configure.ac b/configure.ac
index 49b70fd3a6729cf4a415146e65f5f1c662a1de93..6da8efd861ecc63d9ddb37cd0c4866d009edff29 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
   critic_missing="$critic_missing gcc")
 AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
-  [3.79* | 3.[89]*], critic_missing="$critic_missing make")
+  [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
 
 AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
   [GNU gettext.* \([0-9]*\.[0-9.]*\)],