# HG changeset patch
# User Ray Donnelly <mingw.android@gmail.com>
# Date 1392920588 0
# Node ID 9321d9d7af9bd605eec2811b6703392331db3469
# Parent  ccef9a13c09b151404a05ceba3c22d22ac98931b
If GNU make 3.81 is not found then build it as a companion tool.

Signed-off-by: Ray Donnelly <mingw.android@gmail.com>
[yann.morin.1998@free.fr: add message "checking for make 3.81"]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <8b8bf6998f3d239f6c74.1392920971@advancedsearch.virginmedia.com>
Patchwork-Id: 322302

diff -r ccef9a13c09b -r 9321d9d7af9b config/companion_tools.in
--- a/config/companion_tools.in	Thu Feb 20 18:22:50 2014 +0000
+++ b/config/companion_tools.in	Thu Feb 20 18:23:08 2014 +0000
@@ -2,7 +2,15 @@
 
 menu "Companion tools"
 
+config COMP_TOOLS_make_3_81_NEEDED
+    bool
+    depends on ! CONFIGURE_has_make381
+    default y
+    select COMP_TOOLS
+    select COMP_TOOLS_make
+
 comment "READ HELP before you say 'Y' below !!!"
+
 config COMP_TOOLS
     bool
     prompt "Build some companion tools"
diff -r ccef9a13c09b -r 9321d9d7af9b configure.ac
--- a/configure.ac	Thu Feb 20 18:22:50 2014 +0000
+++ b/configure.ac	Thu Feb 20 18:23:08 2014 +0000
@@ -220,6 +220,20 @@
 AC_SUBST([MAKE], [$ac_cv_path_MAKE])
 AC_PROG_MAKE_SET
 
+# Check for GNU make 3.81 exactly, otherwise
+# it will be built as a companion tool.
+AC_MSG_CHECKING([for make 3.81])
+AS_IF(
+      [test "$MAKE_ver" = "GNU Make 3.81"],
+      [make381="y"
+       AC_MSG_RESULT([yes])
+      ],
+      [make381=
+       AC_MSG_RESULT([no])
+      ]
+     )
+ACX_SET_KCONFIG_OPTION([make381])
+
 #----------------------------------------
 # Check for libtool >= 1.5.26
 AC_CACHE_VAL([ac_cv_path_LIBTOOL],