diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-01-27 05:05:17 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2017-01-28 04:40:47 (GMT) |
| commit | 7a94c81e5bf171d1258aa60438482fd44e5f9800 (patch) | |
| tree | ca62d7a573dd46eefceeb56bf494ba2b1a697016 /config/companion_tools.in | |
| parent | 0636034688b0d03577ae1b543c92ebab90d14c68 (diff) | |
Rework configure logic wrt GNU autotools
Rather than requiring them of a certain version, detect if they are present
(and have sufficient version) and select an appropriate companion tool
otherwise. The reason is that, for example, most recent gettext requires
automake 1.15, but the newest available CentOS has 1.13. Hence, the option
to "upgrade your system" does not apply, and the warning comment above
the companion tools is rather scary.
With this approach, it will work out of the box - either by using the host's
tools, or by building them as needed. Note that the user can still change
the setting in the config.
While there, propagate the new version checking macro to awk/bash/host binutils,
and switch from --with-foo=xxx to officially blessed FOO=xxx: the latter
does not require checking for bogus values (i.e., --with-foo, --without-foo)
and AC_PROG_* macros recognize the corresponding settings without further
modifications. For now, I kept --with-foo=, if only to complain and steer
people to the new way. To be cleaned up after a release.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'config/companion_tools.in')
| -rw-r--r-- | config/companion_tools.in | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/config/companion_tools.in b/config/companion_tools.in index 1df9802..5291f46 100644 --- a/config/companion_tools.in +++ b/config/companion_tools.in @@ -2,28 +2,6 @@ menu "Companion tools" -config COMP_TOOLS_FORCE_make_3_81 - def_bool y - depends on ! CONFIGURE_has_make_3_81_or_newer - select COMP_TOOLS - select COMP_TOOLS_make - -comment "READ HELP before you say 'Y' below !!!" - -config COMP_TOOLS - bool - prompt "Build some companion tools" - help - Crosstool-NG relies on some external tools to be recent enough, namely: - make >= 3.81 - m4 >= 1.4.12 - autoconf >= 2.63 - automake >= 1.10.2 - libtool >= 2.2.4 - - If your system has older versions, we can build them for you, - but you are strongly encouraged to update your system instead! - config COMP_TOOLS_FOR_HOST bool prompt "Install companion tools for host" @@ -32,8 +10,6 @@ config COMP_TOOLS_FOR_HOST tools into the final toolchain (rather than just using them to build it). -if COMP_TOOLS || COMP_TOOLS_FOR_HOST source "config.gen/companion_tools.in" -endif endmenu |