From: Simon Josefsson <simon@josefsson.org>
Date: Tue, 22 Feb 2022 11:47:14 +0000 (+0100)
Subject: gnulib-tool: Bump automake dependency.
X-Git-Tag: v1.0~2353
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a24ff8a1045d8d38824088c0984bb59d0192e65;p=thirdparty%2Fgnulib.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 7f0970e310..48870de3bd 100644
--- 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
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}"