changeset 19151:57cfaf6acf14

gnulib-tool.py: follow gnulib-tool changes, part 6 Follow gnulib-tool change 2013-05-10 Stefano Lattarini <stefano.lattarini@gmail.com> deps: require Automake >= 1.9.6 in generated Makefile fragments
author Bruno Haible <bruno@clisp.org>
date Sat, 09 Sep 2017 01:06:34 +0200
parents 5c17a702a50f
children f5f147b4bbdf
files ChangeLog pygnulib/GLEmiter.py pygnulib/GLTestDir.py
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Sep 09 01:04:08 2017 +0200
+++ b/ChangeLog	Sat Sep 09 01:06:34 2017 +0200
@@ -13587,7 +13587,7 @@
 	maint.mk: catch more abuse of HAVE_DECL in syntax-check
 	* top/maint.mk (sc_prohibit_defined_have_decl_tests): Relax regex.
 
-2012-05-10  Stefano Lattarini  <stefano.lattarini@gmail.com>
+2013-05-10  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	deps: require Automake >= 1.9.6 in generated Makefile fragments
 
--- a/pygnulib/GLEmiter.py	Sat Sep 09 01:04:08 2017 +0200
+++ b/pygnulib/GLEmiter.py	Sat Sep 09 01:06:34 2017 +0200
@@ -756,7 +756,7 @@
             # object files (example: hash.c and libxml/hash.c).
             if uses_subdirs:
                 subdir_options = string(' subdir-objects')
-            emit += 'AUTOMAKE_OPTIONS = 1.5 gnits%s\n' % subdir_options
+            emit += 'AUTOMAKE_OPTIONS = 1.9.6 gnits%s\n' % subdir_options
         emit += '\n'
         if not makefile:
             emit += 'SUBDIRS =\n'
@@ -1045,7 +1045,7 @@
         subdir_options = string()
         if uses_subdirs:
             subdir_options = string(' subdir-objects')
-        emit += 'AUTOMAKE_OPTIONS = 1.5 foreign%s\n\n' % subdir_options
+        emit += 'AUTOMAKE_OPTIONS = 1.9.6 foreign%s\n\n' % subdir_options
         if for_test and not single_configure:
             emit += 'ACLOCAL_AMFLAGS = -I %s/%s\n\n' % (
                 testsbase_inverse, m4base)
--- a/pygnulib/GLTestDir.py	Sat Sep 09 01:04:08 2017 +0200
+++ b/pygnulib/GLTestDir.py	Sat Sep 09 01:06:34 2017 +0200
@@ -521,7 +521,7 @@
         # Create Makefile.am.
         emit = string()
         emit += '## Process this file with automake to produce Makefile.in.\n\n'
-        emit += 'AUTOMAKE_OPTIONS = 1.5 foreign\n\n'
+        emit += 'AUTOMAKE_OPTIONS = 1.9.6 foreign\n\n'
         emit += 'SUBDIRS = %s\n\n' % ' '.join(subdirs)
         emit += 'ACLOCAL_AMFLAGS = -I %s\n' % m4base
         emit = constants.nlconvert(emit)
@@ -949,7 +949,7 @@
         # Create Makefile.am.
         emit = string()
         emit += '## Process this file with automake to produce Makefile.in.\n\n'
-        emit += 'AUTOMAKE_OPTIONS = 1.5 foreign\n\n'
+        emit += 'AUTOMAKE_OPTIONS = 1.9.6 foreign\n\n'
         emit += 'SUBDIRS = %s\n\n' % ' '.join(megasubdirs)
         emit += 'EXTRA_DIST = do-autobuild\n'
         emit = constants.nlconvert(emit)