From 3a24ff8a1045d8d38824088c0984bb59d0192e65 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Tue, 22 Feb 2022 12:47:14 +0100 Subject: gnulib-tool: Bump automake dependency. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnulib-tool (func_emit_lib_Makefile_am) (func_emit_tests_Makefile_am): Demand Automake ≥ 1.14, for %reldir%. --- ChangeLog | 7 +++++++ gnulib-tool | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f0970e310..48870de3bd 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-21 Paul Eggert close-stream: don't depend on fclose diff --git a/gnulib-tool b/gnulib-tool index 99854415ba..9ee7560209 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -3861,7 +3861,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 @@ -4261,7 +4261,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}" -- cgit v1.2.1