diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | pygnulib/GLEmiter.py | 4 | ||||
| -rw-r--r-- | pygnulib/GLTestDir.py | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -13587,7 +13587,7 @@ o Test only that noncanonical values do not cause crashes, not that 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 diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index 178cdee292..daefeca12a 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -756,7 +756,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [ # 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 @@ AC_DEFUN([%V1%_LIBSOURCES], [ 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) diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py index 8e49a91f25..61407502ab 100644 --- a/pygnulib/GLTestDir.py +++ b/pygnulib/GLTestDir.py @@ -521,7 +521,7 @@ class GLTestDir(object): # 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 @@ class GLMegaTestDir(object): # 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) |