00db10
#
00db10
# BZ #16037
00db10
#
00db10
# Allow building glibc with make version 4.0 or greater.
00db10
# This facilitates testing and QE on non-RHEL environments during
00db10
# patch development.
00db10
#
00db10
# commit 28d708c44bc47b56f6551ff285f78edcf61c208a
00db10
# Author: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
00db10
# Date:   Thu Oct 31 12:37:50 2013 +1000
00db10
#
00db10
#    Accept make versions 4.0 and greater
00db10
#
00db10
diff -urN glibc-2.17-c758a686/configure glibc-2.17-c758a686/configure
00db10
--- glibc-2.17-c758a686/configure	2015-01-15 16:32:14.983435268 -0500
00db10
+++ glibc-2.17-c758a686/configure	2015-01-15 16:32:45.396495266 -0500
00db10
@@ -4991,7 +4991,7 @@
00db10
   ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
00db10
   case $ac_prog_version in
00db10
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
00db10
-    3.79* | 3.[89]*)
00db10
+    3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
00db10
        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
00db10
     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
00db10
 
00db10
diff -urN glibc-2.17-c758a686/configure.in glibc-2.17-c758a686/configure.in
00db10
--- glibc-2.17-c758a686/configure.in	2015-01-15 16:32:14.781441511 -0500
00db10
+++ glibc-2.17-c758a686/configure.in	2015-01-15 16:32:34.970817501 -0500
00db10
@@ -945,7 +945,7 @@
00db10
   critic_missing="$critic_missing gcc")
00db10
 AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
00db10
   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
00db10
-  [3.79* | 3.[89]*], critic_missing="$critic_missing make")
00db10
+  [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
00db10
 
00db10
 AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
00db10
   [GNU gettext.* \([0-9]*\.[0-9.]*\)],