]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool.py: Follow gnulib-tool changes, part 46.
authorCollin Funk <collin.funk1@gmail.com>
Thu, 7 Mar 2024 06:12:15 +0000 (22:12 -0800)
committerBruno Haible <bruno@clisp.org>
Thu, 7 Mar 2024 11:44:27 +0000 (12:44 +0100)
Follow gnulib-tool change
2022-02-22  Simon Josefsson  <simon@josefsson.org>
gnulib-tool: Bump automake dependency.

* pygnulib/GLEmiter.py (GLEmiter.lib_Makefile_am)
(GLEmiter.tests_Makefile_am): Require Automake >= 1.14, for %reldir%
support.

ChangeLog
gnulib-tool.py.TODO
pygnulib/GLEmiter.py

index cd8fa303bb760f2ce6f45ad36abbeb818651549a..0858f6d878da58b1d999acfcf854d94c67e4c7aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2024-03-07  Collin Funk  <collin.funk1@gmail.com>
+
+       gnulib-tool.py: Follow gnulib-tool changes, part 46.
+       Follow gnulib-tool change
+       2022-02-22  Simon Josefsson  <simon@josefsson.org>
+       gnulib-tool: Bump automake dependency.
+       * pygnulib/GLEmiter.py (GLEmiter.lib_Makefile_am)
+       (GLEmiter.tests_Makefile_am): Require Automake >= 1.14, for %reldir%
+       support.
+
 2024-03-07  Collin Funk  <collin.funk1@gmail.com>
 
        gnulib-tool.py: Follow gnulib-tool changes, part 45.
index a78335e6fd37f23c24293124fbf690205c9b6c7d..a2414115aa38392ce25a1cd7e900c75dc78fcc13 100644 (file)
@@ -81,18 +81,6 @@ Date:   Tue Mar 1 10:01:22 2022 -0800
 
 --------------------------------------------------------------------------------
 
-commit 3a24ff8a1045d8d38824088c0984bb59d0192e65
-Author: Simon Josefsson <simon@josefsson.org>
-Date:   Tue Feb 22 12:47:14 2022 +0100
-
-    gnulib-tool: Bump automake dependency.
-
-    * gnulib-tool (func_emit_lib_Makefile_am)
-    (func_emit_tests_Makefile_am): Demand Automake ≥ 1.14, for
-    %reldir%.
-
---------------------------------------------------------------------------------
-
 commit 4bf9c96497946ce6f7b84f6527ed0291657cf728
 Author: Bruno Haible <bruno@clisp.org>
 Date:   Sun Jan 9 15:38:51 2022 +0100
index 6b90c4956f35fcc2978650d8045f243045f360b2..3545d9801845965bf00d07d2b8cfbd098d45698e 100644 (file)
@@ -761,7 +761,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [
             # object files (example: hash.c and libxml/hash.c).
             if uses_subdirs:
                 subdir_options = ' subdir-objects'
-            emit += 'AUTOMAKE_OPTIONS = 1.11 gnits%s\n' % subdir_options
+            emit += 'AUTOMAKE_OPTIONS = 1.14 gnits%s\n' % subdir_options
         emit += '\n'
         if not makefile_name:
             emit += 'SUBDIRS =\n'
@@ -1067,7 +1067,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [
         subdir_options = ''
         if uses_subdirs:
             subdir_options = ' subdir-objects'
-        emit += 'AUTOMAKE_OPTIONS = 1.11 foreign%s\n\n' % subdir_options
+        emit += 'AUTOMAKE_OPTIONS = 1.14 foreign%s\n\n' % subdir_options
         if for_test and not single_configure:
             emit += 'ACLOCAL_AMFLAGS = -I %s/%s\n\n' % (testsbase_inverse, m4base)