]> 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)
committerSimon Josefsson <simon@josefsson.org>
Tue, 22 Feb 2022 11:47:14 +0000 (12:47 +0100)
* gnulib-tool (func_emit_lib_Makefile_am)
(func_emit_tests_Makefile_am): Demand Automake ≥ 1.14, for
%reldir%.

ChangeLog
gnulib-tool

index 7f0970e31026716a18be605b0188668a383b043e..48870de3bd7495dd7655d96fdd5ace2a50e40ad9 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-21  Paul Eggert  <eggert@cs.ucla.edu>
 
        close-stream: don't depend on fclose
index 99854415ba672eb1611cc072c92dfa479e0982be..9ee756020986ec945f97e7a4cd6f2b876648c25f 100755 (executable)
@@ -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}"