From f1f5693dfacc3c08910f55b268552e6f9f108858 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sat, 9 Apr 2022 18:55:11 +0200 Subject: 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@ --- m4/groff.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'm4') 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]) -- cgit v1.2.1