46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
|
From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
|
||
|
|
Date: Thu, 10 Oct 2013 14:26:12 +0900
|
||
|
|
Subject: [PATCH] configure: allow building with GNU Make 4
|
||
|
|
|
||
|
|
Currently, configure errors telling make 4 is too old
|
||
|
|
since it does not match our regexp.
|
||
|
|
|
||
|
|
configure.in: allow GNU Make 4.*
|
||
|
|
|
||
|
|
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
|
||
|
|
---
|
||
|
|
configure | 2 +-
|
||
|
|
configure.in | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure b/configure
|
||
|
|
index 5e2f4d0..e139bf0 100755
|
||
|
|
--- configure
|
||
|
|
+++ 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.*)
|
||
|
|
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 a7f9881..95c36b6 100644
|
||
|
|
--- configure.in
|
||
|
|
+++ configure.in
|
||
|
|
@@ -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.*], critic_missing="$critic_missing make")
|
||
|
|
|
||
|
|
AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
|
||
|
|
[GNU gettext.* \([0-9]*\.[0-9.]*\)],
|
||
|
|
--
|
||
|
|
1.8.4.1
|
||
|
|
|