Use "doc" man page format if mandoc present.

Previously configure would not select the "doc" man page format if
mandoc was present but nroff was not.  This checks for mandoc first
and removes a now-superflous AC_PATH_PROG.  Based on a patch from
vehk at vehk.de and feedback from schwarze at usta.de.

1 files changed, 5 insertions, 5 deletions

diff --git a/configure.ac b/configure.ac
index 9022ee9c9..17a11deef 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