[groff] 01/01: Fix the configuration of texi2dvi.

[Ingo Schwarze]

schwarze pushed a commit to branch master
in repository groff.

commit f1f5693dfacc3c08910f55b268552e6f9f108858
Author: Ingo Schwarze <schwarze@openbsd.org>
AuthorDate: Sat Apr 9 18:55:11 2022 +0200

    Fix the configuration of texi2dvi.
    
    m4/groff.m4: Set groff_have_texi2dvi if texi2dvi(1) is available
    and useable, even if the availability was specified by the user by
    manually providing the configure variable PROG_TEXI2DVI, and not
    only if it was autodetected.
    Also, set the PROG_TEXI2DVI Makefile variable to the name of the
    texi2dvi program specified by the user or autodetected, and not to
    the string "found", such that this Makefile variable can be used
    for invoking the program.
    
    doc/doc.am: Call the texi2dvi program specified by the user or
    autodetected rather than hardcoding "texi2dvi".  This lets the groff
    build succeed on systems where the first texi2dvi in the $PATH is
    an old version unfit for groff's purposes.
    
    feedback and OK  gbranden@
---
 ChangeLog   | 17 +++++++++++++++++
 doc/doc.am  |  9 ++-------
 m4/groff.m4 |  4 ++--
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1fb95937..f7588903 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2022-04-09  Ingo Schwarze <schwarze@openbsd.org>
+
+       Fix the configuration of texi2dvi.
+
+       * m4/groff.m4: Set groff_have_texi2dvi if texi2dvi(1) is available
+       and useable, even if the availability was specified by the user
+       by manually providing the configure variable PROG_TEXI2DVI,
+       and not only if it was autodetected.
+       Also, set the PROG_TEXI2DVI Makefile variable to the name of
+       the texi2dvi program specified by the user or autodetected,
+       and not to the string "found", such that this Makefile variable
+       can be used for invoking the program.
+       * doc/doc.am: Call the texi2dvi program specified by the user
+       or autodetected rather than hardcoding "texi2dvi".  This lets
+       the groff build succeed on systems where the first texi2dvi
+       in the $PATH is an old version unfit for groff's purposes.
+
 2022-04-08  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [man]: Abbreviate long `TH` arguments more carefully.
diff --git a/doc/doc.am b/doc/doc.am
index f7078e63..f55fe1ed 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -557,11 +557,6 @@ MAINTAINERCLEANFILES += doc/groff.html doc/groff.html.node
 # The distribution archive gets these formats too; TeX is required.
 EXTRA_DIST += doc/groff.dvi doc/groff.pdf
 
-# GNU Make has a built-in variable TEXI2DVI, but that is not true of
-# all 'make' implementations.  As it defaults to 'texi2dvi', we (at
-# worst) harmlessly redefine it here.
-TEXI2DVI = texi2dvi
-
 # Define pattern rules to make our Texinfo manual in DVI and PDF
 # formats.  These are not built by default.  'pdf' and 'dvi' and their
 # installation counterparts 'install-pdf' and 'install-dvi' are standard
@@ -574,7 +569,7 @@ if HAVE_TEXI2DVI
        TEXINPUTS="$(top_srcdir)/build-aux:$(TEXINPUTS)" \
        MAKEINFO='$(MAKEINFO) -I $(doc_srcdir)' \
        FORCE_SOURCE_DATE=1 \
-       $(TEXI2DVI) -e --batch --build-dir=doc/`basename $@`.t2d \
+       $(PROG_TEXI2DVI) -e --batch --build-dir=doc/`basename $@`.t2d \
          -o $@ $<
 else
        @echo "program texi2dvi is missing or too old;" \
@@ -589,7 +584,7 @@ if HAVE_TEXI2DVI
        LC_ALL=C \
        TEXINPUTS="$(top_srcdir)/build-aux:$(TEXINPUTS)" \
        MAKEINFO='$(MAKEINFO) -I $(doc_srcdir)' \
-       $(TEXI2DVI) -e --batch --pdf --build-dir=doc/`basename $@`.t2p \
+       $(PROG_TEXI2DVI) -e --batch --pdf --build-dir=doc/`basename $@`.t2p \
          -o $@ $<
 else
        @echo "program texi2dvi is missing or too old;" \
diff --git a/m4/groff.m4 b/m4/groff.m4
index 35c35852..50077e71 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -210,9 +210,9 @@ AC_DEFUN([GROFF_MAKEINFO],
 # is too old, the latter is too.
 AC_DEFUN([GROFF_TEXI2DVI],
   [AC_REQUIRE([GROFF_MAKEINFO])
-   AC_CHECK_PROG([PROG_TEXI2DVI], [texi2dvi], [found], [missing])
+   AC_CHECK_PROG([PROG_TEXI2DVI], [texi2dvi], [texi2dvi], [missing])
    groff_have_texi2dvi=no
-   if test "$PROG_TEXI2DVI" = found && test -n "$MAKEINFO"
+   if test "$PROG_TEXI2DVI" != missing && test -n "$MAKEINFO"
    then
       groff_have_texi2dvi=yes
    fi])