From: Simon Josefsson Date: Tue, 22 Feb 2022 11:47:14 +0000 (+0100) Subject: gnulib-tool: Bump automake dependency. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=38b2eb9f21acbfb7a17b7dc6ff244679b186e93f;p=gnulib.git gnulib-tool: Bump automake dependency. * gnulib-tool (func_emit_lib_Makefile_am) (func_emit_tests_Makefile_am): Demand Automake ≥ 1.14, for %reldir%. --- diff --git a/ChangeLog b/ChangeLog index c444fd17f8..fdab84acc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2022-02-22 Simon Josefsson + + gnulib-tool: Bump automake dependency. + * gnulib-tool (func_emit_lib_Makefile_am) + (func_emit_tests_Makefile_am): Demand Automake ≥ 1.14, for + %reldir%. + 2022-02-20 Bruno Haible Document that Automake ≥ 1.14 is needed (regression 2021-12-15). diff --git a/gnulib-tool b/gnulib-tool index be0bced22c..8a2c94ca64 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -3872,7 +3872,7 @@ func_emit_lib_Makefile_am () if test -n "$uses_subdirs"; then subdir_options=' subdir-objects' fi - echo "AUTOMAKE_OPTIONS = 1.11 gnits${subdir_options}" + echo "AUTOMAKE_OPTIONS = 1.14 gnits${subdir_options}" fi echo if test -z "$makefile_name"; then @@ -4262,7 +4262,7 @@ func_emit_tests_Makefile_am () if test -n "$uses_subdirs"; then subdir_options=' subdir-objects' fi - echo "AUTOMAKE_OPTIONS = 1.11 foreign${subdir_options}" + echo "AUTOMAKE_OPTIONS = 1.14 foreign${subdir_options}" echo if $for_test && ! $single_configure; then echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}"