summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2001-04-25 21:40:28 -0700
committerTim Rice <tim@multitalents.net>2001-04-25 21:40:28 -0700
commit07183b8e17da2fcb077f5205047ac0cf6b5805af (patch)
treeec3fd9103ab7d5698e4e46c04628a4975c5ec179
parentda2ed56f61f3b28259c0aa32d89e5e6f08228a4b (diff)
- tim@mindrot.org 2001/04/25 21:38:01 [configure.in]
man page detection fixes for SCO
-rw-r--r--ChangeLog4
-rw-r--r--configure.in6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 50b14c85..d5834d55 100644
--- 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
@@ -5250,4 +5252,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1170 2001/04/25 12:50:18 djm Exp $
+$Id: ChangeLog,v 1.1171 2001/04/26 04:40:28 tim Exp $
diff --git a/configure.in b/configure.in
index c23bf0d8..e35d757c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.281 2001/04/25 12:50:19 djm Exp $
+# $Id: configure.in,v 1.282 2001/04/26 04:40:28 tim Exp $
AC_INIT(ssh.c)
@@ -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