summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2019-05-10 15:04:42 +1000
committerDarren Tucker <dtucker@dtucker.net>2019-05-10 15:04:42 +1000
commit285546b73e2c172565c992a695927ac8cf3b4cc6 (patch)
treee54dc383f1acae8ed8f24973ce4a5723fbd8a7ac
parent62dd70613b77b229f53db3cc1c3e8a206fa2b582 (diff)
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.
-rw-r--r--configure.ac10
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])
41AC_PATH_PROG([TEST_MINUS_S_SH], [sh]) 41AC_PATH_PROG([TEST_MINUS_S_SH], [sh])
42AC_PATH_PROG([SH], [sh]) 42AC_PATH_PROG([SH], [sh])
43AC_PATH_PROG([GROFF], [groff]) 43AC_PATH_PROG([GROFF], [groff])
44AC_PATH_PROG([NROFF], [nroff]) 44AC_PATH_PROG([NROFF], [nroff awf])
45AC_PATH_PROG([MANDOC], [mandoc]) 45AC_PATH_PROG([MANDOC], [mandoc])
46AC_SUBST([TEST_SHELL], [sh]) 46AC_SUBST([TEST_SHELL], [sh])
47 47
48dnl select manpage formatter 48dnl select manpage formatter to be used to build "cat" format pages.
49if test "x$MANDOC" != "x" ; then 49if test "x$MANDOC" != "x" ; then
50 MANFMT="$MANDOC" 50 MANFMT="$MANDOC"
51elif test "x$NROFF" != "x" ; then 51elif test "x$NROFF" != "x" ; then
@@ -4626,9 +4626,9 @@ AC_ARG_WITH([mantype],
4626 ] 4626 ]
4627) 4627)
4628if test -z "$MANTYPE"; then 4628if test -z "$MANTYPE"; then
4629 TestPath="/usr/bin${PATH_SEPARATOR}/usr/ucb" 4629 if ${MANDOC} ${srcdir}/ssh.1 >/dev/null 2>&1; then
4630 AC_PATH_PROGS([NROFF], [nroff awf], [/bin/false], [$TestPath]) 4630 MANTYPE=doc
4631 if ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then 4631 elif ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then
4632 MANTYPE=doc 4632 MANTYPE=doc
4633 elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then 4633 elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then
4634 MANTYPE=man 4634 MANTYPE=man