Have texi2dvi use TeX4ht instead of HeVeA to produce HTML outputs.

	* build-aux/tex.mk (TEXI2HTML): Add --tex4ht.
	* bootstrap (tempdir): Check for TeX4HT, dvipng and convert (from
	ImageMagick).

ChangeLog

+2010-03-15  Roland Levillain  <roland@lrde.epita.fr>
+
+	Have texi2dvi use TeX4ht instead of HeVeA to produce HTML outputs.
+
+	* build-aux/tex.mk (TEXI2HTML): Add --tex4ht.
+	* bootstrap (tempdir): Check for TeX4ht, dvipng and convert (from
+	ImageMagick).
+
 2010-03-15  Roland Levillain  <roland@lrde.epita.fr>
 
 	Support HTML outputs in tex.mk.

bootstrap

@@ -129,8 +129,26 @@ export LIBTOOLIZE=$libtoolize
 require $libtoolize 1.5.22
 
 require doxygen 1.5.6
-# FIXME: These should no longer be required when TeX4HT is used.
-require hevea 1.10 -version
+require convert 6.3.7
+
+# Check for TeX4ht.  htlatex and friends do not have options like
+# `--version', `-version', `-v', etc.  Hence this ad hoc procedure.
+tempdir=`mktemp -d`
+cleanup() { rm -rf "$tempdir"; exit; }
+trap cleanup 0 1 2 3 6 15
+(
+  cd "$tempdir"
+  cat >test.tex <<EOF
+  \documentclass{article}
+  \begin{document}
+  Test
+  \end{document}
+EOF
+  htlatex >/dev/null 2>&1 test.tex || fatal "TeX4ht is required"
+)
+rm -rf "$tempdir"
+# dvipnh is required by TeX4ht.
+require dvipng 1.11
 
 # Tell what's going on.
 set -x

build-aux/tex.mk

@@ -27,7 +27,7 @@ TEXI2DVI_FLAGS = --tidy --build-dir=tmp.t2d --batch
 TEXI2PDF = $(TEXI2DVI) --pdf
 TEXI2PDF_FLAGS = $(TEXI2DVI_FLAGS)
 
-TEXI2HTML = $(TEXI2DVI) --html
+TEXI2HTML = $(TEXI2DVI) --html --tex4ht
 TEXI2HTML_FLAGS = $(TEXI2DVI_FLAGS)
 
 SUFFIXES = .tex .pdf .html