diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2022-04-09 18:55:11 +0200 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2022-04-09 18:55:11 +0200 |
| commit | f1f5693dfacc3c08910f55b268552e6f9f108858 (patch) | |
| tree | 0fa955cb60c773176a271099528f09eca282e817 /m4 | |
| parent | 7409971aacd3431ee9777357856dea2859c2af22 (diff) | |
| download | groff-git-f1f5693dfacc3c08910f55b268552e6f9f108858.tar.gz | |
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@
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/groff.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/m4/groff.m4 b/m4/groff.m4 index 35c35852a..50077e714 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]) |