[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.1-94-g9c22243

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=9c22243af8307cd11923b3373314a5c7723d7c6d

The branch, master has been updated
       via  9c22243af8307cd11923b3373314a5c7723d7c6d (commit)
       via  3c64d54cba6c3dbc09953b50a511e50f8e749421 (commit)
       via  32d81dcd41d33c3e31fe64c243946570b2d400d3 (commit)
      from  205c7572497789676bea3167b9cdeede69236a16 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9c22243af8307cd11923b3373314a5c7723d7c6d
Author: Stefano Lattarini <address@hidden>
Date:   Wed Jun 20 13:49:18 2012 +0200

    maintcheck: guard against obsolete $required entries
    
    * syntax-check.mk: Add rules guarding against the use of the
    obsolete test requirements 'texi2dvi-o' and 'makeinfo-html'.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 3c64d54cba6c3dbc09953b50a511e50f8e749421
Author: Stefano Lattarini <address@hidden>
Date:   Wed Jun 20 12:27:11 2012 +0200

    tests: drop requirement 'makeinfo-html'; 'makeinfo' is enough
    
    * defs: Since we now require Texinfo 4.9 or later in the Automake
    generated Makefiles, and since the '--html' option of makeinfo, as
    well as its capability to generate HTML output, has been supported
    since Texinfo 4.0 (according to the Texinfo NEWS file), the
    requirement 'makeinfo-html' is obsolete -- the simpler requirement
    'makeinfo' is enough.
    * t/instdir-texi.sh ($required): Adjust by using simply 'makeinfo'
    instead of 'makeinfo-html'.
    * t/silent8.sh: Likewise.
    * t/txinfo21.sh: Likewise.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 32d81dcd41d33c3e31fe64c243946570b2d400d3
Author: Stefano Lattarini <address@hidden>
Date:   Wed Jun 20 11:52:20 2012 +0200

    tests: drop requirement 'texi2dvi-o'; 'texi2dvi' is enough
    
    * defs: Since we now require Texinfo 4.9 or later in the Automake
    generated Makefiles, and since the '-o' option of texi2dvi has been
    supported since Texinfo 4.1, the requirement 'texi2dvi-o' is
    obsolete -- the simpler requirement 'texi2dvi' is enough.
    * t/silent8.sh ($required): Adjust by using simply 'texi2dvi'
    instead of 'texi2dvi-o'
    * t/txinfo-no-clutter.sh: Likewise.
    * t/txinfo13.sh: Likewise.
    * t/txinfo23.sh: Likewise.
    * t/txinfo24.sh: Likewise.
    * t/txinfo25.sh: Likewise.
    * t/txinfo28.sh: Likewise.
    * t/txinfo33.sh: Likewise.
    * t/vtexi4.sh: Likewise.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 defs                   |    6 ------
 syntax-checks.mk       |   14 ++++++++++++++
 t/instdir-texi.sh      |    2 +-
 t/silent8.sh           |    2 +-
 t/txinfo-no-clutter.sh |    2 +-
 t/txinfo13.sh          |    2 +-
 t/txinfo21.sh          |    2 +-
 t/txinfo23.sh          |    2 +-
 t/txinfo24.sh          |    2 +-
 t/txinfo25.sh          |    2 +-
 t/txinfo28.sh          |    2 +-
 t/txinfo33.sh          |    2 +-
 t/vtexi4.sh            |    2 +-
 13 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/defs b/defs
index 5034362..a6d2b4a 100644
--- a/defs
+++ b/defs
@@ -934,12 +934,6 @@ do
         skip_all_ "TeX is required, but it wasn't found by configure"
       fi
       ;;
-    texi2dvi-o)
-      # Texi2dvi supports '-o' since Texinfo 4.1.
-      echo "$me: running texi2dvi -o /dev/null --version"
-      texi2dvi -o /dev/null --version \
-        || skip_all_ "required program 'texi2dvi' not available"
-      ;;
     lex)
       test x"$LEX" = x"false" && skip_all_ "lex not found or disabled"
       export LEX
diff --git a/syntax-checks.mk b/syntax-checks.mk
index bd16063..99a0946 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -55,6 +55,7 @@ sc_perl_at_uscore_in_scalar_context \
 sc_perl_local \
 sc_AMDEP_TRUE_in_automake_in \
 sc_tests_make_without_am_makeflags \
+$(sc_obsolete_requirements_rules) \
 sc_tests_obsolete_variables \
 sc_tests_here_document_format \
 sc_tests_Exit_not_exit \
@@ -236,6 +237,19 @@ sc_tests_obsolete_variables:
          exit 1; \
        else :; fi
 
+## Look out for obsolete requirements specified in the test cases.
+sc_obsolete_requirements_rules = sc_no_texi2dvi-o sc_no_makeinfo-html
+modern-requirement.texi2dvi-o = texi2dvi
+modern-requirement.makeinfo-html = makeinfo
+
+$(sc_obsolete_requirements_rules): sc_no_% :
+       @if grep -E 'required=.*\b$*\b' $(xtests); then \
+         echo "Requirement '$*' is obsolete and shouldn't" \
+              "be used anymore." >&2; \
+         echo "You should use '$(modern-requirement.$*)' instead." >&2; \
+         exit 1; \
+       fi
+
 ## Tests should never call some programs directly, but only through the
 ## corresponding variable (e.g., '$MAKE', not 'make').  This will allow
 ## the programs to be overridden at configure time (for less brittleness)
diff --git a/t/instdir-texi.sh b/t/instdir-texi.sh
index 4e4887a..8523993 100755
--- a/t/instdir-texi.sh
+++ b/t/instdir-texi.sh
@@ -17,7 +17,7 @@
 # If $(infodir) is the empty string, then nothing should be installed there.
 # Likewise for the other install-* targets used for texinfo files.
 
-required='makeinfo-html tex texi2dvi'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 dvips --help \
diff --git a/t/silent8.sh b/t/silent8.sh
index f15e99f..6a82008 100755
--- a/t/silent8.sh
+++ b/t/silent8.sh
@@ -16,7 +16,7 @@
 
 # Check texinfo rules in silent-rules mode.
 
-required='makeinfo-html tex texi2dvi-o dvips'
+required='makeinfo tex texi2dvi dvips'
 . ./defs || Exit 1
 
 echo AC_OUTPUT >> configure.ac
diff --git a/t/txinfo-no-clutter.sh b/t/txinfo-no-clutter.sh
index 7c7856f..43b83da 100755
--- a/t/txinfo-no-clutter.sh
+++ b/t/txinfo-no-clutter.sh
@@ -17,7 +17,7 @@
 # The pdf, ps and dvi targets shouldn't let clutter in the build directory.
 # Related to automake bug#11146.
 
-required='makeinfo tex texi2dvi-o dvips'
+required='makeinfo tex texi2dvi dvips'
 . ./defs || Exit 1
 
 mkdir sub
diff --git a/t/txinfo13.sh b/t/txinfo13.sh
index 77f9af7..d3a7079 100755
--- a/t/txinfo13.sh
+++ b/t/txinfo13.sh
@@ -18,7 +18,7 @@
 # Also make sure we do not distribute too much foo.info* files (Report
 # from Vincent Lefevre).
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 echo AC_OUTPUT >> configure.ac
diff --git a/t/txinfo21.sh b/t/txinfo21.sh
index 93543a7..732b5d8 100755
--- a/t/txinfo21.sh
+++ b/t/txinfo21.sh
@@ -17,7 +17,7 @@
 # Test support for building HTML documentation, and the many
 # install-DOC flavors.
 
-required='makeinfo-html tex texi2dvi'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 cat >>configure.ac <<\EOF
diff --git a/t/txinfo23.sh b/t/txinfo23.sh
index e5c1761..4ac9e9f 100755
--- a/t/txinfo23.sh
+++ b/t/txinfo23.sh
@@ -19,7 +19,7 @@
 # (Similar to txinfo13.test, plus DISTCLEANFILES).
 # (See also txinfo24.test and txinfo25.test).
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
diff --git a/t/txinfo24.sh b/t/txinfo24.sh
index 709cee7..ecf4e9c 100755
--- a/t/txinfo24.sh
+++ b/t/txinfo24.sh
@@ -18,7 +18,7 @@
 # (Similar to txinfo16.test, plus CLEANFILES).
 # (See also txinfo23.test and txinfo25.test).
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
diff --git a/t/txinfo25.sh b/t/txinfo25.sh
index 7aa66ae..0d217d5 100755
--- a/t/txinfo25.sh
+++ b/t/txinfo25.sh
@@ -20,7 +20,7 @@
 # (Similar to txinfo16.test, plus CLEANFILES).
 # (See also txinfo23.test and txinfo24.test).
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
diff --git a/t/txinfo28.sh b/t/txinfo28.sh
index 97b36d5..cd09f41 100755
--- a/t/txinfo28.sh
+++ b/t/txinfo28.sh
@@ -19,7 +19,7 @@
 # references.
 # Report from Ralf Corsepius.
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 # This setting, when honored by GNU ls, used to cause an infinite loop
diff --git a/t/txinfo33.sh b/t/txinfo33.sh
index 4bdd767..d35d0d3 100755
--- a/t/txinfo33.sh
+++ b/t/txinfo33.sh
@@ -17,7 +17,7 @@
 # DVIS, PDFS, PSS, HTMLS should not be cleaned upon 'mostlyclean'.
 # Similar to txinfo25.test.
 
-required='makeinfo tex texi2dvi-o dvips'
+required='makeinfo tex texi2dvi dvips'
 . ./defs || Exit 1
 
 mkdir sub
diff --git a/t/vtexi4.sh b/t/vtexi4.sh
index 6038444..bba1b5a 100755
--- a/t/vtexi4.sh
+++ b/t/vtexi4.sh
@@ -21,7 +21,7 @@
 # for more vers*.texi files, and does not require makeinfo, tex and
 # texi2dvi.
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 case `LC_ALL=C date '+%u'` in


hooks/post-receive
-- 
GNU Automake