From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 20 Jun 2012 09:52:20 +0000 (+0200)
Subject: tests: drop requirement 'texi2dvi-o'; 'texi2dvi' is enough
X-Git-Tag: v1.12b~120
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32d81dcd41d33c3e31fe64c243946570b2d400d3;p=platform%2Fupstream%2Fautomake.git

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 <stefano.lattarini@gmail.com>
---

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/t/silent8.sh b/t/silent8.sh
index f15e99f..7393d19 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-html 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/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