[PATCH] deps: require Automake >= 1.9.6 in generated Makefile fragments

[Stefano Lattarini]

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.
---
 ChangeLog                           | 18 ++++++++++++++++++
 gnulib-tool                         |  8 ++++----
 tests/havelib/rpathlx/Makefile.am   |  2 +-
 tests/havelib/rpathly/Makefile.am   |  2 +-
 tests/havelib/rpathlyx/Makefile.am  |  2 +-
 tests/havelib/rpathlz/Makefile.am   |  2 +-
 tests/havelib/rpathlzyx/Makefile.am |  2 +-
 tests/havelib/rpathx/Makefile.am    |  2 +-
 tests/havelib/rpathy/Makefile.am    |  2 +-
 tests/havelib/rpathz/Makefile.am    |  2 +-
 10 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2e8f618..13dafaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2012-05-10  Stefano Lattarini  <address@hidden>
+
+       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  <address@hidden>
 
        bootstrap: AC_INIT may have more than four parameters
diff --git a/gnulib-tool b/gnulib-tool
index 878f272..ed693e0 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -3334,7 +3334,7 @@ func_emit_lib_Makefile_am ()
     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 @@ func_emit_tests_Makefile_am ()
   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 @@ func_create_testdir ()
   # 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 @@ func_create_megatestdir ()
   # 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 --git a/tests/havelib/rpathlx/Makefile.am 
b/tests/havelib/rpathlx/Makefile.am
index da6a22c..86a8b0a 100644
--- a/tests/havelib/rpathlx/Makefile.am
+++ b/tests/havelib/rpathlx/Makefile.am
@@ -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 --git a/tests/havelib/rpathly/Makefile.am 
b/tests/havelib/rpathly/Makefile.am
index 44812b5..a68a205 100644
--- a/tests/havelib/rpathly/Makefile.am
+++ b/tests/havelib/rpathly/Makefile.am
@@ -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 --git a/tests/havelib/rpathlyx/Makefile.am 
b/tests/havelib/rpathlyx/Makefile.am
index 44812b5..a68a205 100644
--- a/tests/havelib/rpathlyx/Makefile.am
+++ b/tests/havelib/rpathlyx/Makefile.am
@@ -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 --git a/tests/havelib/rpathlz/Makefile.am 
b/tests/havelib/rpathlz/Makefile.am
index ff0e602..7078c0c 100644
--- a/tests/havelib/rpathlz/Makefile.am
+++ b/tests/havelib/rpathlz/Makefile.am
@@ -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 --git a/tests/havelib/rpathlzyx/Makefile.am 
b/tests/havelib/rpathlzyx/Makefile.am
index ff0e602..7078c0c 100644
--- a/tests/havelib/rpathlzyx/Makefile.am
+++ b/tests/havelib/rpathlzyx/Makefile.am
@@ -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 --git a/tests/havelib/rpathx/Makefile.am b/tests/havelib/rpathx/Makefile.am
index 69b4cc9..42617ac 100644
--- a/tests/havelib/rpathx/Makefile.am
+++ b/tests/havelib/rpathx/Makefile.am
@@ -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 --git a/tests/havelib/rpathy/Makefile.am b/tests/havelib/rpathy/Makefile.am
index 6b44f37..6dc16f6 100644
--- a/tests/havelib/rpathy/Makefile.am
+++ b/tests/havelib/rpathy/Makefile.am
@@ -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 --git a/tests/havelib/rpathz/Makefile.am b/tests/havelib/rpathz/Makefile.am
index 675dda2..56a3648 100644
--- a/tests/havelib/rpathz/Makefile.am
+++ b/tests/havelib/rpathz/Makefile.am
@@ -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
-- 
1.8.3.rc0.19.g7e6a0cc