From: Collin Funk Date: Thu, 7 Mar 2024 06:12:15 +0000 (-0800) Subject: gnulib-tool.py: Follow gnulib-tool changes, part 46. X-Git-Tag: v1.0~318 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=a53d717bbb11e9e6f213a7b11c6a85263670c5ef;p=gnulib.git gnulib-tool.py: Follow gnulib-tool changes, part 46. Follow gnulib-tool change 2022-02-22 Simon Josefsson gnulib-tool: Bump automake dependency. * pygnulib/GLEmiter.py (GLEmiter.lib_Makefile_am) (GLEmiter.tests_Makefile_am): Require Automake >= 1.14, for %reldir% support. --- diff --git a/ChangeLog b/ChangeLog index cd8fa303bb..0858f6d878 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2024-03-07 Collin Funk + + gnulib-tool.py: Follow gnulib-tool changes, part 46. + Follow gnulib-tool change + 2022-02-22 Simon Josefsson + 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 gnulib-tool.py: Follow gnulib-tool changes, part 45. diff --git a/gnulib-tool.py.TODO b/gnulib-tool.py.TODO index a78335e6fd..a2414115aa 100644 --- a/gnulib-tool.py.TODO +++ b/gnulib-tool.py.TODO @@ -81,18 +81,6 @@ Date: Tue Mar 1 10:01:22 2022 -0800 -------------------------------------------------------------------------------- -commit 3a24ff8a1045d8d38824088c0984bb59d0192e65 -Author: Simon Josefsson -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 Date: Sun Jan 9 15:38:51 2022 +0100 diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index 6b90c4956f..3545d98018 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -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)