[PATCH 2 of 2] If GNU make 3.81 is not found then build it as a companion tool

[mingw dot android at gmail dot com]

# HG changeset patch
# User Ray Donnelly <mingw.android@gmail.com>
# Date 1392920588 0
#      Thu Feb 20 18:23:08 2014 +0000
# Node ID 8b8bf6998f3d239f6c74d0f91782164af9f3c741
# Parent  3e204a5cf9648db53a6a2a6070d301ec705f6dd4
If GNU make 3.81 is not found then build it as a companion tool.

Signed-off-by: Ray Donnelly <mingw.android@gmail.com>

diff -r 3e204a5cf964 -r 8b8bf6998f3d 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,6 +2,13 @@
 
 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
diff -r 3e204a5cf964 -r 8b8bf6998f3d 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,15 @@
 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.
+AS_IF(
+      [test "$MAKE_ver" = "GNU Make 3.81"],
+      [make381="y"],
+      [make381=]
+     )
+ACX_SET_KCONFIG_OPTION([make381])
+
 #----------------------------------------
 # Check for libtool >= 1.5.26
 AC_CACHE_VAL([ac_cv_path_LIBTOOL],

--
For unsubscribe information see http://sourceware.org/lists.html#faq