From: Collin Funk Date: Fri, 1 Mar 2024 02:15:19 +0000 (-0800) Subject: gnulib-tool.py: Follow gnulib-tool changes, part 37. X-Git-Tag: v1.0~352 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=227b36e4ade7a846077fd939c32f942526ad504f;p=gnulib.git gnulib-tool.py: Follow gnulib-tool changes, part 37. Follow gnulib-tool change 2018-10-22 Bruno Haible Assume Automake >= 1.11. * pygnulib/GLEmiter.py (GLEmiter.lib_Makefile_am) (GLEmiter.tests_Makefile_am): Emit a Makefile.am that requires Automake >= 1.11. * pygnulib/GLTestDir.py (GLTestDir.execute, GLMegaTestDir.execute): Likewise. * pygnulib/constants.py: Update comment. --- diff --git a/ChangeLog b/ChangeLog index 39e65420fc..69c7f20c04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2024-03-01 Collin Funk + + gnulib-tool.py: Follow gnulib-tool changes, part 37. + Follow gnulib-tool change + 2018-10-22 Bruno Haible + Assume Automake >= 1.11. + * pygnulib/GLEmiter.py (GLEmiter.lib_Makefile_am) + (GLEmiter.tests_Makefile_am): Emit a Makefile.am that requires Automake + >= 1.11. + * pygnulib/GLTestDir.py (GLTestDir.execute, GLMegaTestDir.execute): + Likewise. + * pygnulib/constants.py: Update comment. + 2024-03-01 Collin Funk gnulib-tool.py: Fix GNU Make conversion regular expressions. diff --git a/gnulib-tool.py.TODO b/gnulib-tool.py.TODO index 3fe32282a7..6e02953d57 100644 --- a/gnulib-tool.py.TODO +++ b/gnulib-tool.py.TODO @@ -687,22 +687,6 @@ Date: Fri Jan 4 19:34:19 2019 +0100 -------------------------------------------------------------------------------- -commit 97eae14a5b2506457a72f89d5897a20730ab6eee -Author: Bruno Haible -Date: Tue Oct 23 00:06:46 2018 +0200 - - Assume Automake >= 1.11. - - * m4/configmake.m4: Update comments. - * m4/lib-link.m4 (AC_LIB_RPATH): Assume AC_REQUIRE_AUX_FILE exists. - * m4/po.m4 (AM_PO_SUBDIRS, AM_POSTPROCESS_PO_MAKEFILE): Eliminate uses - of 'eval'. - * gnulib-tool (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am, - func_create_testdir, func_create_megatestdir): Emit a Makefile.am that - requires Automake >= 1.11. - --------------------------------------------------------------------------------- - commit 8b1d4a63e34f3893036d82f39c5680e845de5ddf Author: Bruno Haible Date: Mon Sep 3 21:19:16 2018 +0200 diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index 9030a67fe3..2a28021938 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -750,7 +750,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.9.6 gnits%s\n' % subdir_options + emit += 'AUTOMAKE_OPTIONS = 1.11 gnits%s\n' % subdir_options emit += '\n' if not makefile_name: emit += 'SUBDIRS =\n' @@ -1026,7 +1026,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [ subdir_options = '' if uses_subdirs: subdir_options = ' subdir-objects' - emit += 'AUTOMAKE_OPTIONS = 1.9.6 foreign%s\n\n' % subdir_options + emit += 'AUTOMAKE_OPTIONS = 1.11 foreign%s\n\n' % subdir_options if for_test and not single_configure: emit += 'ACLOCAL_AMFLAGS = -I %s/%s\n\n' % (testsbase_inverse, m4base) diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py index a7fd806d4f..9f5e0fe38f 100644 --- a/pygnulib/GLTestDir.py +++ b/pygnulib/GLTestDir.py @@ -512,7 +512,7 @@ class GLTestDir(object): # Create Makefile.am. emit = '## Process this file with automake to produce Makefile.in.\n\n' - emit += 'AUTOMAKE_OPTIONS = 1.9.6 foreign\n\n' + emit += 'AUTOMAKE_OPTIONS = 1.11 foreign\n\n' emit += 'SUBDIRS = %s\n\n' % ' '.join(subdirs) emit += 'ACLOCAL_AMFLAGS = -I %s\n' % m4base emit = constants.nlconvert(emit) @@ -962,7 +962,7 @@ class GLMegaTestDir(object): # Create Makefile.am. emit = '## Process this file with automake to produce Makefile.in.\n\n' - emit += 'AUTOMAKE_OPTIONS = 1.9.6 foreign\n\n' + emit += 'AUTOMAKE_OPTIONS = 1.11 foreign\n\n' emit += 'SUBDIRS = %s\n\n' % ' '.join(megasubdirs) emit += 'EXTRA_DIST = do-autobuild\n' emit = constants.nlconvert(emit) diff --git a/pygnulib/constants.py b/pygnulib/constants.py index 0f6f5c67f0..918faa8cc0 100644 --- a/pygnulib/constants.py +++ b/pygnulib/constants.py @@ -124,7 +124,7 @@ TESTS = \ DEFAULT_AUTOCONF_MINVERSION = 2.64 # You can set AUTOCONFPATH to empty if autoconf 2.64 is already in your PATH AUTOCONFPATH = '' -# You can set AUTOMAKEPATH to empty if automake 1.9.x is already in your PATH +# You can set AUTOMAKEPATH to empty if automake 1.11 is already in your PATH AUTOMAKEPATH = '' # You can set GETTEXTPATH to empty if autopoint 0.15 is already in your PATH GETTEXTPATH = ''