# HG changeset patch # User Stefano Lattarini # Date 1368216784 -7200 # Node ID 9815ae1c3b4fd6821a5075ef336a90dbbaaebf82 # Parent bffc406a63905f11d542d3090db4d4513dc9ed14 deps: require Automake >= 1.9.6 in generated Makefile fragments That is the same minimal version required in the DEPENDENCIES file. Moreover, the old code generated a requirement of Automake >= 1.5, and that is an insanely outdated version. * gnulib-tool: Bump minimal version requirement in AUTOMAKE_OPTIONS. * tests/havelib/rpathlx/Makefile.am: Likewise. * tests/havelib/rpathly/Makefile.am: Likewise. * tests/havelib/rpathlyx/Makefile.am: Likewise. * tests/havelib/rpathlz/Makefile.am: Likewise. * tests/havelib/rpathlzyx/Makefile.am: Likewise. * tests/havelib/rpathx/Makefile.am: Likewise. * tests/havelib/rpathy/Makefile.am: Likewise. * tests/havelib/rpathz/Makefile.am: Likewise. diff -r bffc406a6390 -r 9815ae1c3b4f ChangeLog --- a/ChangeLog Fri May 10 07:54:43 2013 -0700 +++ b/ChangeLog Fri May 10 22:13:04 2013 +0200 @@ -1,3 +1,21 @@ +2012-05-10 Stefano Lattarini + + deps: require Automake >= 1.9.6 in generated Makefile fragments + + That is the same minimal version required in the DEPENDENCIES file. + Moreover, the old code generated a requirement of Automake >= 1.5, + and that is an insanely outdated version. + + * gnulib-tool: Bump minimal version requirement in AUTOMAKE_OPTIONS. + * tests/havelib/rpathlx/Makefile.am: Likewise. + * tests/havelib/rpathly/Makefile.am: Likewise. + * tests/havelib/rpathlyx/Makefile.am: Likewise. + * tests/havelib/rpathlz/Makefile.am: Likewise. + * tests/havelib/rpathlzyx/Makefile.am: Likewise. + * tests/havelib/rpathx/Makefile.am: Likewise. + * tests/havelib/rpathy/Makefile.am: Likewise. + * tests/havelib/rpathz/Makefile.am: Likewise. + 2013-05-08 Eric Blake bootstrap: AC_INIT may have more than four parameters diff -r bffc406a6390 -r 9815ae1c3b4f gnulib-tool --- a/gnulib-tool Fri May 10 07:54:43 2013 -0700 +++ b/gnulib-tool Fri May 10 22:13:04 2013 +0200 @@ -3334,7 +3334,7 @@ if test -n "$uses_subdirs"; then subdir_options=' subdir-objects' fi - echo "AUTOMAKE_OPTIONS = 1.5 gnits${subdir_options}" + echo "AUTOMAKE_OPTIONS = 1.9.6 gnits${subdir_options}" fi echo if test -z "$makefile_name"; then @@ -3643,7 +3643,7 @@ if test -n "$uses_subdirs"; then subdir_options=' subdir-objects' fi - echo "AUTOMAKE_OPTIONS = 1.5 foreign${subdir_options}" + echo "AUTOMAKE_OPTIONS = 1.9.6 foreign${subdir_options}" echo if $for_test && ! $single_configure; then echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}" @@ -5888,7 +5888,7 @@ # Create Makefile.am. (echo "## Process this file with automake to produce Makefile.in." echo - echo "AUTOMAKE_OPTIONS = 1.5 foreign" + echo "AUTOMAKE_OPTIONS = 1.9.6 foreign" echo echo "SUBDIRS = $subdirs" echo @@ -6197,7 +6197,7 @@ # Create Makefile.am. (echo "## Process this file with automake to produce Makefile.in." echo - echo "AUTOMAKE_OPTIONS = 1.5 foreign" + echo "AUTOMAKE_OPTIONS = 1.9.6 foreign" echo echo "SUBDIRS = $megasubdirs" echo diff -r bffc406a6390 -r 9815ae1c3b4f tests/havelib/rpathlx/Makefile.am --- a/tests/havelib/rpathlx/Makefile.am Fri May 10 07:54:43 2013 -0700 +++ b/tests/havelib/rpathlx/Makefile.am Fri May 10 22:13:04 2013 +0200 @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies +AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies bin_PROGRAMS = usex usex_SOURCES = usex.c LDADD = @LIBRPATHX@ diff -r bffc406a6390 -r 9815ae1c3b4f tests/havelib/rpathly/Makefile.am --- a/tests/havelib/rpathly/Makefile.am Fri May 10 07:54:43 2013 -0700 +++ b/tests/havelib/rpathly/Makefile.am Fri May 10 22:13:04 2013 +0200 @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies +AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies bin_PROGRAMS = usey usey_SOURCES = usey.c LDADD = @LIBRPATHY@ diff -r bffc406a6390 -r 9815ae1c3b4f tests/havelib/rpathlyx/Makefile.am --- a/tests/havelib/rpathlyx/Makefile.am Fri May 10 07:54:43 2013 -0700 +++ b/tests/havelib/rpathlyx/Makefile.am Fri May 10 22:13:04 2013 +0200 @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies +AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies bin_PROGRAMS = usey usey_SOURCES = usey.c LDADD = @LIBRPATHY@ diff -r bffc406a6390 -r 9815ae1c3b4f tests/havelib/rpathlz/Makefile.am --- a/tests/havelib/rpathlz/Makefile.am Fri May 10 07:54:43 2013 -0700 +++ b/tests/havelib/rpathlz/Makefile.am Fri May 10 22:13:04 2013 +0200 @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies +AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies bin_PROGRAMS = usez usez_SOURCES = usez.c LDADD = @LIBRPATHZ@ diff -r bffc406a6390 -r 9815ae1c3b4f tests/havelib/rpathlzyx/Makefile.am --- a/tests/havelib/rpathlzyx/Makefile.am Fri May 10 07:54:43 2013 -0700 +++ b/tests/havelib/rpathlzyx/Makefile.am Fri May 10 22:13:04 2013 +0200 @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies +AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies bin_PROGRAMS = usez usez_SOURCES = usez.c LDADD = @LIBRPATHZ@ diff -r bffc406a6390 -r 9815ae1c3b4f tests/havelib/rpathx/Makefile.am --- a/tests/havelib/rpathx/Makefile.am Fri May 10 07:54:43 2013 -0700 +++ b/tests/havelib/rpathx/Makefile.am Fri May 10 22:13:04 2013 +0200 @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies +AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies lib_LTLIBRARIES = librpathx.la librpathx_la_SOURCES = rpathx.c librpathx_la_LDFLAGS = -lc -no-undefined diff -r bffc406a6390 -r 9815ae1c3b4f tests/havelib/rpathy/Makefile.am --- a/tests/havelib/rpathy/Makefile.am Fri May 10 07:54:43 2013 -0700 +++ b/tests/havelib/rpathy/Makefile.am Fri May 10 22:13:04 2013 +0200 @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies +AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies lib_LTLIBRARIES = librpathy.la librpathy_la_SOURCES = rpathy.c librpathy_la_LDFLAGS = @LTLIBRPATHX@ -lc -no-undefined diff -r bffc406a6390 -r 9815ae1c3b4f tests/havelib/rpathz/Makefile.am --- a/tests/havelib/rpathz/Makefile.am Fri May 10 07:54:43 2013 -0700 +++ b/tests/havelib/rpathz/Makefile.am Fri May 10 22:13:04 2013 +0200 @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies +AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies lib_LTLIBRARIES = librpathz.la librpathz_la_SOURCES = rpathz.c librpathz_la_LDFLAGS = @LTLIBRPATHX@ @LTLIBRPATHY@ -lc -no-undefined