- (djm) Fixes from Andrew McGill <andrewm@datrix.co.za>:

[openssh.git] / configure.in

diff --git a/configure.in b/configure.in
index a043e7f9278029a862f31d146b99b2c40f4aeef8..3bdf41133b75ef50e5193706b93d527003c1fa2c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -36,6 +36,8 @@ case "$host" in
        fi
        AC_CHECK_FUNC(authenticate, [AC_DEFINE(WITH_AIXAUTHENTICATE)])
        AC_DEFINE(BROKEN_GETADDRINFO)
+       MANTYPE='$(CATMAN)'
+       mansubdir=cat
        dnl AIX handles lastlog as part of its login message
        AC_DEFINE(DISABLE_LASTLOG)
        ;;
@@ -106,6 +108,15 @@ case "$host" in
        need_dash_r=1
        # hardwire lastlog location (can't detect it on some versions)
        conf_lastlog_location="/var/adm/lastlog"
+       AC_MSG_CHECKING(for obsolete utmp and wtmp in solaris2.x)
+       sol2ver=`echo "$host"| sed -e 's/.*[[0-9]]\.//'`
+       if test "$sol2ver" -ge 8; then
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(DISABLE_UTMP)
+               AC_DEFINE(DISABLE_WTMP)
+       else
+               AC_MSG_RESULT(no)
+       fi
        ;;
 *-*-sunos4*)
        CFLAGS="$CFLAGS -DSUNOS4"
@@ -118,6 +129,14 @@ case "$host" in
        mansubdir=cat
        LIBS="$LIBS -lgen -lsocket"
        ;;
+*-*-sco3*)
+       CFLAGS="$CFLAGS -I/usr/local/include"
+       LDFLAGS="$LDFLAGS -L/usr/local/lib"
+       MANTYPE='$(CATMAN)'
+       mansubdir=cat
+       LIBS="$LIBS -lgen -lsocket"
+       no_dev_ptmx=1
+       ;;
 esac
 
 # Allow user to specify flags
@@ -159,7 +178,7 @@ if test -z "$no_libnsl" ; then
 fi
 
 # Checks for header files.
-AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h time.h util.h utmp.h utmpx.h)
+AC_CHECK_HEADERS(bstring.h endian.h lastlog.h limits.h login.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h time.h util.h utmp.h utmpx.h)
 
 # Checks for library functions.
 AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage innetgr md5_crypt memmove mkdtemp on_exit openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy vsnprintf vhangup _getpty __b64_ntop)
@@ -985,7 +1004,7 @@ AC_TRY_COMPILE([
                [ char *lastlog = _PATH_LASTLOG; ],
                [ AC_MSG_RESULT(yes) ],
                [
-                       AC_MSG_RESULT(no),
+                       AC_MSG_RESULT(no)
                        system_lastlog_path=no
                ])
        ]
@@ -994,13 +1013,13 @@ AC_TRY_COMPILE([
 if test -z "$conf_lastlog_location"; then
        if test x"$system_lastlog_path" = x"no" ; then
                for f in /var/log/lastlog /usr/adm/lastlog /var/adm/lastlog /etc/security/lastlog ; do
-                               if test -d "$f" -o -e "$f" ; then
+                               if test -d "$f" -o -f "$f" ; then
                                        conf_lastlog_location=$f
                                fi
                done
                if test -z "$conf_lastlog_location"; then
-                       AC_MSG_WARN([** Cannot find lastlog - disabling feature **])
-                       AC_DEFINE(DISABLE_LASTLOG)
+                       AC_MSG_WARN([** Cannot find lastlog **])
+                       dnl Don't define DISABLE_LASTLOG - that means we don't try wtmp/wtmpx
                fi
        fi
 fi
@@ -1124,7 +1143,7 @@ fi
 
 
 # Change default command timeout for builtin PRNG
-entropy_timeout=100
+entropy_timeout=200
 AC_ARG_WITH(entropy-timeout,
        [  --with-entropy-timeout  Specify entropy gathering command timeout (msec)],
        [