diff options
| author | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2013-10-31 12:37:50 +1000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-11-24 12:34:20 -0500 |
| commit | b15ad643798707d247598a765edfa0ac0e8088c5 (patch) | |
| tree | c90243633fcea995e6cd6baad55c82639e8eab8a | |
| parent | d8827b41e4a39c352bd8478671398b63a76dc03a (diff) | |
| download | glibc-b15ad643798707d247598a765edfa0ac0e8088c5.zip glibc-b15ad643798707d247598a765edfa0ac0e8088c5.tar.gz glibc-b15ad643798707d247598a765edfa0ac0e8088c5.tar.bz2 | |
Accept make versions 4.0 and greater
URL: https://bugs.gentoo.org/487906
(cherry picked from commit 28d708c44bc47b56f6551ff285f78edcf61c208a)
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -4772,7 +4772,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.in b/configure.in index 769e8ef..2364142 100644 --- a/configure.in +++ b/configure.in @@ -989,7 +989,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.]*\)], |