Skip to content

Commit 3b21a78

Browse files
committed
Merge #18290: build: Set minimum Automake version to 1.13
ddc7e42 build: Set minimum Automake version to 1.13 (Hennadii Stepanov) Pull request description: This PR suggests to set the required minimum Automake version to `1.13` explicitly for the following reasons: - it guarantees that [CVE-2012-3386](https://lists.gnu.org/archive/html/automake/2012-07/msg00023.html) has been fixed - `AC_CONFIG_MACRO_DIR` macro support, which we already use; from the [release notes](https://lists.gnu.org/archive/html/automake/2012-12/msg00038.html): > Improvements to aclocal and related rebuilds rules: > - Autoconf-provided macros AC_CONFIG_MACRO_DIR and AC_CONFIG_MACRO_DIRS are now traced by aclocal, and can be used to declare the local m4 include directories. Formerly, one had to specify it with an explicit '-I' option to the 'aclocal' invocation. - `AM_SILENT_RULES` macro support (since version `1.11`) Automake `1.13` requires Autoconf `2.65` or greater. We already have `2.69` since #17769. --- For reference, Automake `1.13` was released in [December of 2012](https://lists.gnu.org/archive/html/automake/2012-12/msg00038.html). CentOS 7 uses Automake [`1.13.4`](https://centos.pkgs.org/7/centos-x86_64/automake-1.13.4-3.el7.noarch.rpm.html) See the Automake docs for more info: - [`AM_INIT_AUTOMAKE`](https://www.gnu.org/software/automake/manual/automake.html#Public-Macros) - [List of Automake options](https://www.gnu.org/software/automake/manual/automake.html#List-of-Automake-options) ACKs for top commit: laanwj: so also ACK ddc7e42 fanquake: ACK ddc7e42 - I think adding a minimum required version here is fine. I'd be surprised if someone who is currently building Bitcoin Core was unable to after this change. Tree-SHA512: a1f97864bc3a513450c03d041498f28e823e6f8cd9710d81df081435d72bd4b6cd2f3deb997dbf902f950215a859e48a2ee7ca1f8ebf4271778dd951ab78abf4
2 parents d20d5dc + ddc7e42 commit 3b21a78

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ dnl faketime breaks configure and is only needed for make. Disable it here.
3636
unset FAKETIME
3737

3838
dnl Automake init set-up and checks
39-
AM_INIT_AUTOMAKE([no-define subdir-objects foreign])
39+
AM_INIT_AUTOMAKE([1.13 no-define subdir-objects foreign])
4040

4141
dnl faketime messes with timestamps and causes configure to be re-run.
4242
dnl --disable-maintainer-mode can be used to bypass this.
4343
AM_MAINTAINER_MODE([enable])
4444

4545
dnl make the compilation flags quiet unless V=1 is used
46-
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
46+
AM_SILENT_RULES([yes])
4747

4848
dnl Compiler checks (here before libtool).
4949
if test "x${CXXFLAGS+set}" = "xset"; then

0 commit comments

Comments
 (0)