1.1 --- a/config/companion_tools.in	Thu Feb 20 18:22:50 2014 +0000
     1.2 +++ b/config/companion_tools.in	Thu Feb 20 18:23:08 2014 +0000
     1.3 @@ -2,7 +2,15 @@
     1.4  
     1.5  menu "Companion tools"
     1.6  
     1.7 +config COMP_TOOLS_make_3_81_NEEDED
     1.8 +    bool
     1.9 +    depends on ! CONFIGURE_has_make381
    1.10 +    default y
    1.11 +    select COMP_TOOLS
    1.12 +    select COMP_TOOLS_make
    1.13 +
    1.14  comment "READ HELP before you say 'Y' below !!!"
    1.15 +
    1.16  config COMP_TOOLS
    1.17      bool
    1.18      prompt "Build some companion tools"

     2.1 --- a/configure.ac	Thu Feb 20 18:22:50 2014 +0000
     2.2 +++ b/configure.ac	Thu Feb 20 18:23:08 2014 +0000
     2.3 @@ -220,6 +220,20 @@
     2.4  AC_SUBST([MAKE], [$ac_cv_path_MAKE])
     2.5  AC_PROG_MAKE_SET
     2.6  
     2.7 +# Check for GNU make 3.81 exactly, otherwise
     2.8 +# it will be built as a companion tool.
     2.9 +AC_MSG_CHECKING([for make 3.81])
    2.10 +AS_IF(
    2.11 +      [test "$MAKE_ver" = "GNU Make 3.81"],
    2.12 +      [make381="y"
    2.13 +       AC_MSG_RESULT([yes])
    2.14 +      ],
    2.15 +      [make381=
    2.16 +       AC_MSG_RESULT([no])
    2.17 +      ]
    2.18 +     )
    2.19 +ACX_SET_KCONFIG_OPTION([make381])
    2.20 +
    2.21  #----------------------------------------
    2.22  # Check for libtool >= 1.5.26
    2.23  AC_CACHE_VAL([ac_cv_path_LIBTOOL],