]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool: Bump automake dependency.
authorSimon Josefsson <simon@josefsson.org>
Tue, 22 Feb 2022 11:47:14 +0000 (12:47 +0100)
committerBruno Haible <bruno@clisp.org>
Wed, 31 Aug 2022 22:48:35 +0000 (00:48 +0200)
* gnulib-tool (func_emit_lib_Makefile_am)
(func_emit_tests_Makefile_am): Demand Automake ≥ 1.14, for
%reldir%.

ChangeLog
gnulib-tool

index c444fd17f83b4fb534c296eb88e9c2ce01fb46c6..fdab84acc02ddafa3b558b282cea347eff38fe58 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-02-22  Simon Josefsson  <simon@josefsson.org>
+
+       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  <bruno@clisp.org>
 
        Document that Automake ≥ 1.14 is needed (regression 2021-12-15).
index be0bced22c0b3095a23f5bb4c5e4637d2389e2a8..8a2c94ca644f7420011cec8e11a43ad19aa01f00 100755 (executable)
@@ -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}"