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 | |
| 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')
| -rw-r--r-- | config/companion_tools/autoconf.in | 5 | ||||
| -rw-r--r-- | config/companion_tools/automake.in | 1 | ||||
| -rw-r--r-- | config/companion_tools/libtool.in | 2 | ||||
| -rw-r--r-- | config/companion_tools/m4.in | 1 | ||||
| -rw-r--r-- | config/companion_tools/make.in | 1 |
5 files changed, 9 insertions, 1 deletions
diff --git a/config/companion_tools/autoconf.in b/config/companion_tools/autoconf.in index 3b33df6..b85e1f9 100644 --- a/config/companion_tools/autoconf.in +++ b/config/companion_tools/autoconf.in @@ -1,5 +1,7 @@ # Autoconf +## default y if !CONFIGURE_has_autoconf_2_63_or_newer +## default y if !CONFIGURE_has_autoreconf_2_63_or_newer ## help Autoconf choice @@ -14,7 +16,8 @@ config AUTOCONF_V_2_69 config AUTOCONF_V_2_65 bool - prompt "2.65" + prompt "2.65 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/companion_tools/automake.in b/config/companion_tools/automake.in index 781a44a..31d036b 100644 --- a/config/companion_tools/automake.in +++ b/config/companion_tools/automake.in @@ -1,5 +1,6 @@ # Automake +## default y if !CONFIGURE_has_automake_1_15_or_newer ## help Automake choice diff --git a/config/companion_tools/libtool.in b/config/companion_tools/libtool.in index 62e6ee1..5c14fa0 100644 --- a/config/companion_tools/libtool.in +++ b/config/companion_tools/libtool.in @@ -1,5 +1,7 @@ # Libtool +## default y if !CONFIGURE_has_libtool_2_4_or_newer +## default y if !CONFIGURE_has_libtoolize_2_4_or_newer ## help Libtool choice diff --git a/config/companion_tools/m4.in b/config/companion_tools/m4.in index a09e9fa..eb6a3d3 100644 --- a/config/companion_tools/m4.in +++ b/config/companion_tools/m4.in @@ -1,5 +1,6 @@ # GNU m4 +## default y if !CONFIGURE_has_gnu_m4_1_4_12_or_newer ## help GNU m4 choice diff --git a/config/companion_tools/make.in b/config/companion_tools/make.in index e9e7997..b6834a7 100644 --- a/config/companion_tools/make.in +++ b/config/companion_tools/make.in @@ -1,5 +1,6 @@ # GNU make +## default y if !CONFIGURE_has_make_3_81_or_newer ## help GNU make choice |