diff options
| author |   Alexey Neyman <stilor@att.net> | 2016-11-22 18:02:04 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2016-11-22 18:02:04 (GMT) |
| commit | 0946ce59a09609b743b7dba40f7212778011f286 (patch) | |
| tree | aa666685885104ed985b4c743ad3222968e7ae54 /configure.ac | |
| parent | 3eb2e351f02d82fad255a9e6433c4c4d659c5de0 (diff) | |
| parent | 87bfd55b3b5329c7f306fa291ca5e0950a2c9da1 (diff) | |
Merge pull request #479 from stilor/gmake-link-fix
Gmake link fix
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 8651015..492d315 100644 --- a/configure.ac +++ b/configure.ac @@ -241,19 +241,21 @@ AC_CACHE_CHECK([for GNU make >= 3.80], [ac_cv_path_MAKE], AC_SUBST([MAKE], [$ac_cv_path_MAKE]) AC_PROG_MAKE_SET -# Check for GNU make 3.81 exactly, otherwise +# Check for GNU make 3.81 or newer, otherwise # it will be built as a companion tool. -AC_MSG_CHECKING([for make 3.81]) +AC_MSG_CHECKING([if make is 3.81 or newer]) AS_IF( - [test "$MAKE_ver" = "GNU Make 3.81"], - [make381="y" + [[MAKE_ver2=$(echo "$MAKE_ver" \ + |$EGREP '^GNU Make (3.81|3.9[0-9]|[4-9])') + test -n "$MAKE_ver2"]], + [make_3_81_or_newer="y" AC_MSG_RESULT([yes]) ], - [make381= + [make_3_81_or_newer= AC_MSG_RESULT([no]) ] ) -ACX_SET_KCONFIG_OPTION([make381]) +ACX_SET_KCONFIG_OPTION([make_3_81_or_newer]) #---------------------------------------- # Check for libtool >= 1.5.26 |