- tim@mindrot.org 2001/04/25 21:38:01 [configure.in]

   man page detection fixes for SCO

diff --git a/ChangeLog b/ChangeLog
index 9b2076dbae4b4f28ceaf3abab97f1de0fc2665b8..d3ff9630caa2497f633ea343124379f24350447b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@
    (default: off), implies KbdInteractiveAuthentication. Suggestion from 
    markus@
  - (djm) Include crypt.h if available in auth-passwd.c
+ - tim@mindrot.org 2001/04/25 21:38:01 [configure.in]
+   man page detection fixes for SCO
 
 20010424
  - OpenBSD CVS Sync

diff --git a/configure.in b/configure.in
index 84fba8cdd0af0aac273d6d487ebf3242f009d546..5f96ab25e3269ff4d1afe43dac96a193c6684f29 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -221,6 +221,7 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
        AC_DEFINE(BROKEN_SAVED_UIDS)
        AC_CHECK_FUNCS(getluid setluid)
+       MANTYPE=man
        ;;
 *-*-sco3.2v5*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
@@ -233,6 +234,7 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(DISABLE_SHADOW)
        AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
        AC_CHECK_FUNCS(getluid setluid)
+       MANTYPE=man
        ;;
 *-dec-osf*)
        if test ! -z "USE_SIA" ; then
@@ -1413,7 +1415,7 @@ AC_ARG_WITH(catman,
        ]
 )
 if test -z "$MANTYPE"; then
-       AC_PATH_PROGS(NROFF, nroff awf, /bin/false)
+       AC_PATH_PROGS(NROFF, nroff awf, /bin/false, /usr/bin:/usr/ucb)
        if ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then
                MANTYPE=doc
        elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then