Use our own fixed copy of texi2html.

diff --git a/ChangeLog b/ChangeLog
index be1d0b993ee8e64be16df92dd90f1c1af72ff3a6..548e9961c8affc547b09a677482235ea7ee00930 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-19  Bruno Haible  <haible@clisp.cons.org>
+
+       * configure.in: Remove check for texi2html.
+
 2001-10-09  Bruno Haible  <haible@clisp.cons.org>
 
        * configure.in: Also check for putc_unlocked.

diff --git a/configure.in b/configure.in
index d6740bcfa21cd24c551fa39fe60b9702f4ff52e7..c3499e30be15a04bfa6e3a380af1d65b70ab504d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -104,12 +104,11 @@ dnl Check for tools needed for formatting the documentation.
 ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
 AC_PATH_PROG(DVIPS, dvips, $ac_aux_dir_abs/missing dvips)
 AC_PATH_PROG(TEXI2PDF, texi2pdf, $ac_aux_dir_abs/missing texi2pdf)
-AC_PATH_PROG(TEXI2HTML, texi2html, $ac_aux_dir_abs/missing texi2html)
+AC_PATH_PROG(PERL, perl, $ac_aux_dir_abs/missing perl)
 
 dnl Check for tools needed for formatting man pages.
 CROSS_COMPILING=$cross_compiling
 AC_SUBST(CROSS_COMPILING)
-AC_PATH_PROG(PERL, perl, $ac_aux_dir_abs/missing perl)
 
 dnl Generate the version information file in the intl/ directory.
 test -d intl || mkdir intl

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 03489f6dc0ba85efc8b900d80625a86dc4c47a85..5e253f56a59f685fcc09cbbf28025770ad4fdc5a 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-19  Bruno Haible  <haible@clisp.cons.org>
+
+       * texi2html: New file, from texi2html-1.52 with modifications.
+       * Makefile.am (TEXI2HTML): Use @PERL@, not @TEXI2HTML@.
+       (gettext_toc.html): Update accordingly.
+
 2001-10-11  Bruno Haible  <haible@clisp.cons.org>
 
        * msgattrib.texi: New file.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index ce8468599349aa17c1ea48411c3d90e8607ca328..77b55e8d38beeb02738fc42d000ed11de8f73f24 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -129,7 +129,7 @@ uninstall-pdf:
 
 # Documentation in HTML format.
 
-TEXI2HTML = @TEXI2HTML@
+TEXI2HTML = @PERL@ $(srcdir)/texi2html
 
 html-monolithic: gettext.html
 html-split: gettext_toc.html
@@ -138,8 +138,8 @@ gettext.html: gettext.texi version.texi $(gettext_TEXINFOS)
        $(TEXI2HTML) -expandinfo -number -monolithic `if test -f gettext.texi; then echo gettext.texi; else echo $(srcdir)/gettext.texi; fi`
 
 gettext_toc.html: gettext.texi version.texi $(gettext_TEXINFOS)
-       case "$(TEXI2HTML)" in \
-         *"/missing texi2html") \
+       case "@PERL@" in \
+         *"/missing perl") \
             $(TEXI2HTML) -expandinfo -number -split_chapter `if test -f gettext.texi; then echo gettext.texi; else echo $(srcdir)/gettext.texi; fi` || exit 0 ;; \
          *) $(RM) gettext_*.html ; \
             $(TEXI2HTML) -expandinfo -number -split_chapter `if test -f gettext.texi; then echo gettext.texi; else echo $(srcdir)/gettext.texi; fi` ;; \