[PATCH] configure.ac: Add mandoc as valid formatter

[Ingo Schwarze]

Hi Darren,

Darren Tucker wrote on Fri, May 10, 2019 at 03:03:58PM +1000:

> Having read this and Ingo's feedback in addition to performing some git
> archaelogy (and subsequently learning what "awf" is)

  https://manpages.bsd.lv/history.html

> I have come up with the following which I think should resolve this
> by removing one of the AC_PATH_PROG checks.

Your commit looks good and works for me.
Besides, it is surprisingly clean.

Thanks,
  Ingo


> diff --git a/configure.ac b/configure.ac
> index 9022ee9c..17a11dee 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -41,11 +41,11 @@ AC_PATH_PROG([TEST_MINUS_S_SH], [ksh])
>  AC_PATH_PROG([TEST_MINUS_S_SH], [sh])
>  AC_PATH_PROG([SH], [sh])
>  AC_PATH_PROG([GROFF], [groff])
> -AC_PATH_PROG([NROFF], [nroff])
> +AC_PATH_PROG([NROFF], [nroff awf])
>  AC_PATH_PROG([MANDOC], [mandoc])
>  AC_SUBST([TEST_SHELL], [sh])
>  
> -dnl select manpage formatter
> +dnl select manpage formatter to be used to build "cat" format pages.
>  if test "x$MANDOC" != "x" ; then
>  	MANFMT="$MANDOC"
>  elif test "x$NROFF" != "x" ; then
> @@ -4626,9 +4626,9 @@ AC_ARG_WITH([mantype],
>  	]
>  )
>  if test -z "$MANTYPE"; then
> -	TestPath="/usr/bin${PATH_SEPARATOR}/usr/ucb"
> -	AC_PATH_PROGS([NROFF], [nroff awf], [/bin/false], [$TestPath])
> -	if ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then
> +	if ${MANDOC} ${srcdir}/ssh.1 >/dev/null 2>&1; then
> +		MANTYPE=doc
> +	elif ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then
>  		MANTYPE=doc
>  	elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then
>  		MANTYPE=man