]> andersk Git - openssh.git/blobdiff - configure.in
- (djm) Fixes from Andrew McGill <andrewm@datrix.co.za>:
[openssh.git] / configure.in
index 3c26e3d74fba71963b9f22971b53c6d4b46cd0fd..3bdf41133b75ef50e5193706b93d527003c1fa2c 100644 (file)
@@ -11,6 +11,8 @@ AC_PROG_INSTALL
 AC_CHECK_PROG(AR, ar, ar)
 AC_PATH_PROG(PERL, perl)
 AC_SUBST(PERL)
+AC_PATH_PROG(ENT, ent)
+AC_SUBST(ENT)
 
 if test -z "$LD" ; then
        LD=$CC
@@ -32,17 +34,38 @@ case "$host" in
        if test "$LD" != "gcc" -a -z "$blibpath"; then
                blibpath="/usr/lib:/lib:/usr/local/lib"
        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)
        ;;
 *-*-hpux10*)
        if test -z "$GCC"; then
-               CFLAGS="$CFLAGS -Aa"
+               CFLAGS="$CFLAGS -Ae"
+       fi
+       CFLAGS="$CFLAGS -D_HPUX_SOURCE"
+       AC_DEFINE(IPADDR_IN_DISPLAY)
+       AC_MSG_CHECKING(for HPUX trusted system password database)
+       if test -f /tcb/files/auth/system/default; then
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_HPUX_TRUSTED_SYSTEM_PW)
+               LIBS="$LIBS -lsec"
+               AC_MSG_WARN([This configuration is untested])
+       else
+               AC_MSG_RESULT(no)
+               AC_DEFINE(DISABLE_SHADOW)
+       fi
+       MANTYPE='$(CATMAN)'
+       mansubdir=cat
+       ;;
+*-*-hpux11*)
+       if test -z "$GCC"; then
+               CFLAGS="$CFLAGS -Ae"
        fi
        CFLAGS="$CFLAGS -D_HPUX_SOURCE"
-       CFLAGS="$CFLAGS -I/usr/local/include"
-       LDFLAGS="$LDFLAGS -L/usr/local/lib"
        AC_DEFINE(IPADDR_IN_DISPLAY)
-       AC_DEFINE(USE_UTMPX)
        AC_MSG_CHECKING(for HPUX trusted system password database)
        if test -f /tcb/files/auth/system/default; then
                AC_MSG_RESULT(yes)
@@ -58,14 +81,14 @@ case "$host" in
        ;;
 *-*-irix5*)
        CFLAGS="$CFLAGS -I/usr/local/include"
-       LDFLAGS="$LDFLAGS -L/usr/local/lib"
+       LDFLAGS="$LDFLAGS"
        MANTYPE='$(CATMAN)'
        no_libsocket=1
        no_libnsl=1
        ;;
 *-*-irix6*)
        CFLAGS="$CFLAGS -I/usr/local/include"
-       LDFLAGS="$LDFLAGS -L/usr/local/lib"
+       LDFLAGS="$LDFLAGS"
        MANTYPE='$(CATMAN)'
        AC_MSG_WARN([*** Irix 6.x is not tested, please report you experiences *** ])
        no_libsocket=1
@@ -83,18 +106,66 @@ case "$host" in
        CFLAGS="$CFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib -L/usr/ucblib -R/usr/ucblib"
        need_dash_r=1
-       AC_DEFINE(USE_UTMPX)
+       # 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"
+       AC_CHECK_FUNCS(getpwanam)
        ;;
 *-*-sysv*)
        CFLAGS="$CFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-       AC_DEFINE(USE_UTMPX)
        MANTYPE='$(CATMAN)'
        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
+AC_ARG_WITH(cflags,
+       [  --with-cflags           Specify additional flags to pass to compiler],
+       [
+               if test "x$withval" != "xno" ; then
+                       CFLAGS="$CFLAGS $withval"
+               fi
+       ]       
+)
+AC_ARG_WITH(ldflags,
+       [  --with-ldlags           Specify additional flags to pass to linker],
+       [
+               if test "x$withval" != "xno" ; then
+                       LDFLAGS="$LDFLAGS $withval"
+               fi
+       ]       
+)
+AC_ARG_WITH(libs,
+       [  --with-libs             Specify additional libraries to link with],
+       [
+               if test "x$withval" != "xno" ; then
+                       LIBS="$LIBS $withval"
+               fi
+       ]       
+)
+
+
 # Checks for libraries.
 AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first ***]))
 AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil")
@@ -107,10 +178,20 @@ 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 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 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 bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf _getpty)
+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)
+dnl    checks for time functions
+AC_CHECK_FUNCS(gettimeofday time)
+dnl    checks for libutil functions
+AC_CHECK_FUNCS(login logout updwtmp logwtmp)
+dnl    checks for utmp functions
+AC_CHECK_FUNCS(entutent getutent getutid getutline pututline setutent)
+AC_CHECK_FUNCS(utmpname)
+dnl    checks for utmpx functions
+AC_CHECK_FUNCS(entutxent getutxent getutxid getutxline pututxline )
+AC_CHECK_FUNCS(setutxent utmpxname)
 
 AC_CHECK_FUNC(login, 
        [AC_DEFINE(HAVE_LOGIN)],
@@ -140,12 +221,14 @@ if test -z "$no_pam" -a "x$ac_cv_header_security_pam_appl_h" = "xyes" ; then
        AC_CHECK_LIB(dl, dlopen, , )
        LIBS="$LIBS -lpam"
 
+       AC_CHECK_FUNCS(pam_getenvlist)
+
        # Check PAM strerror arguments (old PAM)
        AC_MSG_CHECKING([whether pam_strerror takes only one argument])
        AC_TRY_COMPILE(
                [
-                       #include <stdlib.h>
-                       #include <security/pam_appl.h>
+#include <stdlib.h>
+#include <security/pam_appl.h>
                ], 
                [(void)pam_strerror((pam_handle_t *)NULL, -1);], 
                [AC_MSG_RESULT(no)],
@@ -172,81 +255,60 @@ saved_CFLAGS="$CFLAGS"
 if test "x$prefix" != "xNONE" ; then
        tryssldir="$tryssldir $prefix"
 fi
-AC_MSG_CHECKING([for OpenSSL/SSLeay directory])
-for ssldir in "" $tryssldir /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
-       if test ! -z "$ssldir" ; then
-               LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
-               CFLAGS="$saved_CFLAGS -I$ssldir/include"
-               if test ! -z "$need_dash_r" ; then
-                       LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
-               fi
-       else
-               LDFLAGS="$saved_LDFLAGS"
-       fi
-
-       for WANTS_RSAREF in "" 1 ; do
-               
-               if test -z "$WANTS_RSAREF" ; then
-                       LIBS="$saved_LIBS -lcrypto"
+AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [
+
+       for ssldir in "" $tryssldir /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
+               if test ! -z "$ssldir" ; then
+                       LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
+                       CFLAGS="$saved_CFLAGS -I$ssldir/include"
+                       if test ! -z "$need_dash_r" ; then
+                               LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
+                       fi
                else
-                       LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref"
+                       LDFLAGS="$saved_LDFLAGS"
                fi
 
+               LIBS="$saved_LIBS -lcrypto"
+
+               # Basic test to check for compatible version and correct linking
+               # *does not* test for RSA - that comes later.
                AC_TRY_RUN(
                        [
-                               #include <openssl/rsa.h>
-                               #include <openssl/bn.h>
-                               #include <openssl/sha.h>
-                               int main(void) 
-                               {
-                                       RSA *key; char a[2048],b[2048];;
-                                       memset(a, 0, sizeof(a));memset(b, 0, sizeof(b));
-                                       RAND_add(a, sizeof(a), sizeof(a));
-                                       key=RSA_generate_key(32,3,NULL,NULL);
-                                       if (key==NULL) return(1);
-                                       return(-1==RSA_private_decrypt(RSA_size(key),a,b,key,RSA_NO_PADDING));
-                               }
-                       ],
-                       [
-                               AC_DEFINE(HAVE_OPENSSL)
-                               found_crypto=1
-                               break;
-                       ], []
-               )
-               AC_TRY_RUN(
-                       [
-                               #include <ssl/rsa.h>
-                               #include <ssl/bn.h>
-                               #include <ssl/sha.h>
-                               int main(void) 
-                               {
-                                       RSA *key; char a[2048],b[2048];;
-                                       memset(a, 0, sizeof(a));memset(b, 0, sizeof(b));
-                                       RAND_seed(a, sizeof(a));
-                                       key=RSA_generate_key(32,3,NULL,NULL);
-                                       if (key==NULL) return(1);
-                                       return(-1==RSA_private_decrypt(RSA_size(key),a,b,key,RSA_NO_PADDING));
-                               }
+#include <string.h>
+#include <openssl/rand.h>
+int main(void) 
+{
+       char a[2048];
+       memset(a, 0, sizeof(a));
+       RAND_add(a, sizeof(a), sizeof(a));
+       return(RAND_status() <= 0);
+}
                        ],
                        [
-                               AC_DEFINE(HAVE_SSL)
                                found_crypto=1
                                break;
                        ], []
                )
+
+               if test ! -z "$found_crypto" ; then
+                       break;
+               fi
        done
 
-       if test ! -z "$found_crypto" ; then
-               break;
+       if test -z "$found_crypto" ; then
+               AC_MSG_ERROR([Could not find working SSLeay / OpenSSL libraries, please install])       
+       fi
+       if test -z "$ssldir" ; then
+               ssldir="(system)"
        fi
-done
 
-if test -z "$found_crypto" ; then
-       AC_MSG_ERROR([Could not find working SSLeay / OpenSSL libraries, please install])       
-fi
-if test -z "$ssldir" ; then
-       ssldir="(system)"
-else
+       ac_cv_openssldir=$ssldir
+])
+
+if test ! -z "$ac_cv_openssldir" -a ! "x$ac_cv_openssldir" = "x(system)" ; then
+       AC_DEFINE(HAVE_OPENSSL)
+       dnl Need to recover ssldir - test above runs in subshell
+       ssldir=$ac_cv_openssldir
        CFLAGS="$saved_CFLAGS -I$ssldir/include"
        LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
        if test ! -z "$need_dash_r" ; then
@@ -256,12 +318,53 @@ else
                blibpath="$blibpath:$ssldir:$ssldir/lib"
        fi
 fi
-if test -z "$WANTS_RSAREF" ; then
-       LIBS="$saved_LIBS -lcrypto"
+LIBS="$saved_LIBS -lcrypto"
+
+# Now test RSA support
+saved_LIBS="$LIBS"
+AC_MSG_CHECKING([for RSA support])
+for WANTS_RSAREF in "" 1 ; do
+       if test -z "$WANTS_RSAREF" ; then
+               LIBS="$saved_LIBS"
+       else
+               LIBS="$saved_LIBS -lRSAglue -lrsaref"
+       fi
+       AC_TRY_RUN([
+#include <string.h>
+#include <openssl/rand.h>
+#include <openssl/rsa.h>
+#include <openssl/bn.h>
+#include <openssl/sha.h>
+int main(void) 
+{
+       int num; RSA *key; static unsigned char p_in[] = "blahblah";
+       unsigned char c[256], p[256];
+       memset(c, 0, sizeof(c)); RAND_add(c, sizeof(c), sizeof(c));
+       if ((key=RSA_generate_key(512, 3, NULL, NULL))==NULL) return(1);
+       num = RSA_public_encrypt(sizeof(p_in) - 1, p_in, c, key, RSA_PKCS1_PADDING);
+       return(-1 == RSA_private_decrypt(num, c, p, key, RSA_PKCS1_PADDING));
+}
+       ],
+       [
+               rsa_works=1
+               break;
+       ], [])
+done
+
+if test ! -z "$no_rsa" ; then
+       AC_MSG_RESULT(disabled)
 else
-       LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref"
+       if test -z "$rsa_works" ; then
+               AC_MSG_WARN([*** No RSA support found *** ])
+       else
+               if test -z "$WANTS_RSAREF" ; then
+                       AC_MSG_RESULT(yes)
+               else
+                       AC_MSG_RESULT(using RSAref)
+                       LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref"
+               fi
+       fi
 fi
-AC_MSG_RESULT($ssldir)
 
 # Checks for data types
 AC_CHECK_SIZEOF(char, 1)
@@ -271,36 +374,41 @@ AC_CHECK_SIZEOF(long int, 4)
 AC_CHECK_SIZEOF(long long int, 8)
 
 # More checks for data types
-AC_MSG_CHECKING([for intXX_t types])
-AC_TRY_COMPILE(
-       [#include <sys/types.h>], 
-       [int8_t a; int16_t b; int32_t c; a = b = c = 1;], 
-       [
-               AC_DEFINE(HAVE_INTXX_T)
-               AC_MSG_RESULT(yes)
-               have_intxx_t=1
-       ],
-       [AC_MSG_RESULT(no)]
-) 
+AC_CACHE_CHECK([for intXX_t types], ac_cv_have_intxx_t, [
+       AC_TRY_COMPILE(
+               [ #include <sys/types.h> ], 
+               [ int8_t a; int16_t b; int32_t c; a = b = c = 1;], 
+               [ ac_cv_have_intxx_t="yes" ],
+               [ ac_cv_have_intxx_t="no" ]
+       )
+])
+if test "x$ac_cv_have_intxx_t" = "xyes" ; then
+       AC_DEFINE(HAVE_INTXX_T)
+       have_intxx_t=1
+fi
+       
+AC_CACHE_CHECK([for u_intXX_t types], ac_cv_have_u_intxx_t, [
+       AC_TRY_COMPILE(
+               [ #include <sys/types.h> ], 
+               [ u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;], 
+               [ ac_cv_have_u_intxx_t="yes" ],
+               [ ac_cv_have_u_intxx_t="no" ]
+       )
+])
+if test "x$ac_cv_have_u_intxx_t" = "xyes" ; then
+       AC_DEFINE(HAVE_U_INTXX_T)
+       have_u_intxx_t=1
+fi
 
-AC_MSG_CHECKING([for u_intXX_t types])
-AC_TRY_COMPILE(
-       [#include <sys/types.h>], 
-       [u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;], 
-       [
-               AC_DEFINE(HAVE_U_INTXX_T)
-               AC_MSG_RESULT(yes)
-               have_u_intxx_t=1
-       ],
-       [AC_MSG_RESULT(no)]
-) 
 
 if test -z "$have_u_intxx_t" -o -z "$have_intxx_t" -a \
            "x$ac_cv_header_sys_bitypes_h" = "xyes"
 then
        AC_MSG_CHECKING([for intXX_t and u_intXX_t types in sys/bitypes.h])
        AC_TRY_COMPILE(
-               [#include <sys/bitypes.h>], 
+               [
+#include <sys/bitypes.h>
+               ], 
                [
                        int8_t a; int16_t b; int32_t c;
                        u_int8_t e; u_int16_t f; u_int32_t g;
@@ -316,189 +424,191 @@ then
 fi
 
 if test -z "$have_u_intxx_t" ; then
-       AC_MSG_CHECKING([for uintXX_t types])
+       AC_CACHE_CHECK([for uintXX_t types], ac_cv_have_uintxx_t, [
+               AC_TRY_COMPILE(
+                       [
+#include <sys/types.h>
+                       ], 
+                       [ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1; ], 
+                       [ ac_cv_have_uintxx_t="yes" ],
+                       [ ac_cv_have_uintxx_t="no" ]
+               )
+       ])
+       if test "x$ac_cv_have_uintxx_t" = "xyes" ; then
+               AC_DEFINE(HAVE_UINTXX_T)
+       fi
+fi
+
+AC_CACHE_CHECK([for socklen_t], ac_cv_have_socklen_t, [
        AC_TRY_COMPILE(
-               [#include <sys/types.h>], 
-               [uint8_t a; uint16_t b; uint32_t c; a = b = c = 1;], 
                [
-                       AC_DEFINE(HAVE_UINTXX_T)
-                       AC_MSG_RESULT(yes)
+#include <sys/types.h>
+#include <sys/socket.h>
                ],
-               [AC_MSG_RESULT(no)]
-       ) 
+               [socklen_t foo; foo = 1235;],
+               [ ac_cv_have_socklen_t="yes" ],
+               [ ac_cv_have_socklen_t="no" ]
+       )
+])
+if test "x$ac_cv_have_socklen_t" = "xyes" ; then
+       AC_DEFINE(HAVE_SOCKLEN_T)
 fi
 
-AC_MSG_CHECKING([for socklen_t])
-AC_TRY_COMPILE(
-       [
-               #include <sys/types.h>
-               #include <sys/socket.h>
-       ],
-       [socklen_t foo; foo = 1235;],
-       [
-               AC_DEFINE(HAVE_SOCKLEN_T)
-               AC_MSG_RESULT(yes)
-       ],
-       [AC_MSG_RESULT(no)]
-)
+AC_CACHE_CHECK([for size_t], ac_cv_have_size_t, [
+       AC_TRY_COMPILE(
+               [
+#include <sys/types.h>
+               ],
+               [ size_t foo; foo = 1235; ],
+               [ ac_cv_have_size_t="yes" ],
+               [ ac_cv_have_size_t="no" ]
+       )
+])
+if test "x$ac_cv_have_size_t" = "xyes" ; then
+       AC_DEFINE(HAVE_SIZE_T)
+fi
 
-AC_MSG_CHECKING([for size_t])
-AC_TRY_COMPILE(
-       [#include <sys/types.h>],
-       [size_t foo; foo = 1235;],
-       [
-               AC_DEFINE(HAVE_SIZE_T)
-               AC_MSG_RESULT(yes)
-       ],
-       [AC_MSG_RESULT(no)]
-)
+AC_CACHE_CHECK([for ssize_t], ac_cv_have_ssize_t, [
+       AC_TRY_COMPILE(
+               [
+#include <sys/types.h>
+               ],
+               [ ssize_t foo; foo = 1235; ],
+               [ ac_cv_have_ssize_t="yes" ],
+               [ ac_cv_have_ssize_t="no" ]
+       )
+])
+if test "x$ac_cv_have_ssize_t" = "xyes" ; then
+       AC_DEFINE(HAVE_SSIZE_T)
+fi
 
-AC_MSG_CHECKING([for struct sockaddr_storage])
-AC_TRY_COMPILE(
-       [
-               #include <sys/types.h>
-               #include <sys/socket.h>
-       ],
-       [struct sockaddr_storage s;],
-       [
-               AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE)
-               AC_MSG_RESULT(yes)
-       ],
-       [AC_MSG_RESULT(no)]
-)
 
-AC_MSG_CHECKING([for struct sockaddr_in6])
-AC_TRY_COMPILE(
-       [#include <netinet/in.h>],
-       [struct sockaddr_in6 s; s.sin6_family = 0;],
-       [
-               AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6)
-               AC_MSG_RESULT(yes)
-       ],
-       [AC_MSG_RESULT(no)]
-)
+AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_have_struct_sockaddr_storage, [
+       AC_TRY_COMPILE(
+               [
+#include <sys/types.h>
+#include <sys/socket.h>
+               ],
+               [ struct sockaddr_storage s; ],
+               [ ac_cv_have_struct_sockaddr_storage="yes" ],
+               [ ac_cv_have_struct_sockaddr_storage="no" ]
+       )
+])
+if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then
+       AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE)
+fi
 
-AC_MSG_CHECKING([for struct in6_addr])
-AC_TRY_COMPILE(
-       [#include <netinet/in.h>],
-       [struct in6_addr s; s.s6_addr[0] = 0;],
-       [
-               AC_DEFINE(HAVE_STRUCT_IN6_ADDR)
-               AC_MSG_RESULT(yes)
-       ],
-       [AC_MSG_RESULT(no)]
-)
+AC_CACHE_CHECK([for struct sockaddr_in6], ac_cv_have_struct_sockaddr_in6, [
+       AC_TRY_COMPILE(
+               [
+#include <netinet/in.h>
+               ],
+               [ struct sockaddr_in6 s; s.sin6_family = 0; ],
+               [ ac_cv_have_struct_sockaddr_in6="yes" ],
+               [ ac_cv_have_struct_sockaddr_in6="no" ]
+       )
+])
+if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then
+       AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6)
+fi
+
+AC_CACHE_CHECK([for struct in6_addr], ac_cv_have_struct_in6_addr, [
+       AC_TRY_COMPILE(
+               [
+#include <netinet/in.h>
+               ],
+               [ struct in6_addr s; s.s6_addr[0] = 0; ],
+               [ ac_cv_have_struct_in6_addr="yes" ],
+               [ ac_cv_have_struct_in6_addr="no" ]
+       )
+])
+if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then
+       AC_DEFINE(HAVE_STRUCT_IN6_ADDR)
+fi
+
+AC_CACHE_CHECK([for struct addrinfo], ac_cv_have_struct_addrinfo, [
+       AC_TRY_COMPILE(
+               [
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+               ],
+               [ struct addrinfo s; s.ai_flags = AI_PASSIVE; ],
+               [ ac_cv_have_struct_addrinfo="yes" ],
+               [ ac_cv_have_struct_addrinfo="no" ]
+       )
+])
+if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then
+       AC_DEFINE(HAVE_STRUCT_ADDRINFO)
+fi
 
-AC_MSG_CHECKING([for struct addrinfo])
-AC_TRY_COMPILE(
-       [
-               #include <sys/types.h>
-               #include <sys/socket.h>
-               #include <netdb.h>
-       ],
-       [struct addrinfo s; s.ai_flags = AI_PASSIVE;],
-       [
-               AC_DEFINE(HAVE_STRUCT_ADDRINFO)
-               AC_MSG_RESULT(yes)
-       ],
-       [AC_MSG_RESULT(no)]
-)
 
 # Checks for structure members
-AC_MSG_CHECKING([whether utmp.h has ut_host field])
-AC_EGREP_HEADER(ut_host, utmp.h, 
-       [AC_DEFINE(HAVE_HOST_IN_UTMP) AC_MSG_RESULT(yes); ], 
-       [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmpx.h has ut_host field])
-AC_EGREP_HEADER(ut_host, utmpx.h, 
-       [AC_DEFINE(HAVE_HOST_IN_UTMPX) AC_MSG_RESULT(yes); ], 
-       [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmpx.h has syslen field])
-AC_EGREP_HEADER(syslen, utmpx.h, 
-       [AC_DEFINE(HAVE_SYSLEN_IN_UTMPX) AC_MSG_RESULT(yes); ], 
-       [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmp.h has ut_pid field])
-AC_EGREP_HEADER(ut_pid, utmp.h, 
-       [AC_DEFINE(HAVE_PID_IN_UTMP) AC_MSG_RESULT(yes); ], 
-       [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmp.h has ut_type field])
-AC_EGREP_HEADER(ut_type, utmp.h, 
-       [AC_DEFINE(HAVE_TYPE_IN_UTMP) AC_MSG_RESULT(yes); ], 
-       [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmp.h has ut_tv field])
-AC_EGREP_HEADER(ut_tv, utmp.h, 
-       [AC_DEFINE(HAVE_TV_IN_UTMP) AC_MSG_RESULT(yes); ], 
-       [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmp.h has ut_id field])
-AC_EGREP_HEADER(ut_id, utmp.h, 
-       [AC_DEFINE(HAVE_ID_IN_UTMP) AC_MSG_RESULT(yes); ], 
-       [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmp.h has ut_addr field])
-AC_EGREP_HEADER(ut_addr, utmp.h, 
-       [AC_DEFINE(HAVE_ADDR_IN_UTMP) AC_MSG_RESULT(yes); ], 
-       [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmpx.h has ut_addr field])
-AC_EGREP_HEADER(ut_addr, utmpx.h, 
-       [AC_DEFINE(HAVE_ADDR_IN_UTMPX) AC_MSG_RESULT(yes); ], 
-       [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmp.h has ut_addr_v6 field])
-AC_EGREP_HEADER(ut_addr_v6, utmp.h, 
-       [AC_DEFINE(HAVE_ADDR_V6_IN_UTMP) AC_MSG_RESULT(yes); ], 
-       [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmpx.h has ut_addr_v6 field])
-AC_EGREP_HEADER(ut_addr_v6, utmpx.h, 
-       [AC_DEFINE(HAVE_ADDR_V6_IN_UTMPX) AC_MSG_RESULT(yes); ], 
-       [AC_MSG_RESULT(no)]
-)
-
-AC_MSG_CHECKING([whether struct sockaddr_storage has ss_family field])
-AC_TRY_COMPILE(
-       [
-               #include <sys/types.h>
-               #include <sys/socket.h>
-       ],
-       [struct sockaddr_storage s; s.ss_family = 1;],
-       [
-               AC_DEFINE(HAVE_SS_FAMILY_IN_SS)
-               AC_MSG_RESULT(yes)
-       ],
-       [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether struct sockaddr_storage has __ss_family field])
-AC_TRY_COMPILE(
-       [
-               #include <sys/types.h>
-               #include <sys/socket.h>
-       ],
-       [struct sockaddr_storage s; s.__ss_family = 1;],
-       [
-               AC_DEFINE(HAVE___SS_FAMILY_IN_SS)
-               AC_MSG_RESULT(yes)
-       ],
-       [AC_MSG_RESULT(no)]
-)
 
-AC_MSG_CHECKING([whether libc defines __progname])
-AC_TRY_LINK([], 
-       [extern char *__progname; printf("%s", __progname);], 
-       [
-               AC_DEFINE(HAVE___PROGNAME)
-               AC_MSG_RESULT(yes)
-       ], 
-       [
-               AC_MSG_RESULT(no)
-       ]
-)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_host, utmp.h, HAVE_HOST_IN_UTMP)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_host, utmpx.h, HAVE_HOST_IN_UTMPX)
+OSSH_CHECK_HEADER_FOR_FIELD(syslen, utmpx.h, HAVE_SYSLEN_IN_UTMPX)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_pid, utmp.h, HAVE_PID_IN_UTMP)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_type, utmp.h, HAVE_TYPE_IN_UTMP)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_type, utmpx.h, HAVE_TYPE_IN_UTMPX)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_tv, utmp.h, HAVE_TV_IN_UTMP)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_id, utmp.h, HAVE_ID_IN_UTMP)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_addr, utmp.h, HAVE_ADDR_IN_UTMP)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_addr, utmpx.h, HAVE_ADDR_IN_UTMPX)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_addr_v6, utmp.h, HAVE_ADDR_V6_IN_UTMP)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_addr_v6, utmpx.h, HAVE_ADDR_V6_IN_UTMPX)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_exit, utmp.h, HAVE_EXIT_IN_UTMP)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_time, utmp.h, HAVE_TIME_IN_UTMP)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_time, utmpx.h, HAVE_TIME_IN_UTMPX)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_tv, utmpx.h, HAVE_TV_IN_UTMPX)
+
+
+
+AC_CACHE_CHECK([for ss_family field in struct sockaddr_storage],
+               ac_cv_have_ss_family_in_struct_ss, [
+       AC_TRY_COMPILE(
+               [
+#include <sys/types.h>
+#include <sys/socket.h>
+               ],
+               [ struct sockaddr_storage s; s.ss_family = 1; ],
+               [ ac_cv_have_ss_family_in_struct_ss="yes" ],
+               [ ac_cv_have_ss_family_in_struct_ss="no" ],
+       )
+])
+if test "x$ac_cv_have_ss_family_in_struct_ss" = "xyes" ; then
+       AC_DEFINE(HAVE_SS_FAMILY_IN_SS)
+fi
+
+
+AC_CACHE_CHECK([for __ss_family field in struct sockaddr_storage],
+               ac_cv_have___ss_family_in_struct_ss, [
+       AC_TRY_COMPILE(
+               [
+#include <sys/types.h>
+#include <sys/socket.h>
+               ],
+               [ struct sockaddr_storage s; s.__ss_family = 1; ],
+               [ ac_cv_have___ss_family_in_struct_ss="yes" ],
+               [ ac_cv_have___ss_family_in_struct_ss="no" ]
+       )
+])
+if test "x$ac_cv_have___ss_family_in_struct_ss" = "xyes" ; then
+       AC_DEFINE(HAVE___SS_FAMILY_IN_SS)
+fi
+
+
+AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [
+       AC_TRY_LINK([], 
+               [ extern char *__progname; printf("%s", __progname); ], 
+               [ ac_cv_libc_defines___progname="yes" ],
+               [ ac_cv_libc_defines___progname="no" ]
+       )
+])
+if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
+       AC_DEFINE(HAVE___PROGNAME)
+fi
+
 
 # Looking for programs, paths and files
 AC_ARG_WITH(rsh,
@@ -541,48 +651,6 @@ if test ! -z "$MAIL" ; then
        AC_DEFINE_UNQUOTED(MAIL_DIRECTORY, "$maildir")
 fi
 
-# Look for lastlog location
-AC_ARG_WITH(lastlog,
-       [  --with-lastlog=FILE     Location of lastlog file],
-       [
-               if test "x$withval" = "xno" ; then
-                       AC_DEFINE(DISABLE_LASTLOG)
-               else
-                       AC_DEFINE_UNQUOTED(LASTLOG_LOCATION, "$withval")
-               fi
-       ],
-       [
-               AC_MSG_CHECKING([location of lastlog file])
-               for lastlog in /var/log/lastlog /var/adm/lastlog /usr/adm/lastlog  /etc/security/lastlog ; do
-                       if test -f $lastlog ; then
-                               gotlastlog="file"
-                               break
-                       fi
-                       if test -d $lastlog ; then
-                               gotlastlog="dir"
-                               break
-                       fi
-               done
-               if test -z "$gotlastlog" ; then
-                       AC_MSG_RESULT(not found)
-                       nolastlog=1
-               else
-                       if test "x$gotlastlog" = "xdir" ; then
-                               AC_MSG_RESULT(${lastlog}/)
-                               AC_DEFINE(LASTLOG_IS_DIR)
-                       else
-                               AC_MSG_RESULT($lastlog)
-                               AC_DEFINE_UNQUOTED(LASTLOG_LOCATION, "$lastlog")
-                       fi
-               fi      
-       ]
-)
-
-if test ! -z "$nolastlog" ; then
-       AC_MSG_WARN([*** Disabling lastlog support *** ])
-       AC_DEFINE(DISABLE_LASTLOG)
-fi
-
 if test -z "$no_dev_ptmx" ; then
        AC_CHECK_FILE("/dev/ptmx", 
                [
@@ -632,66 +700,31 @@ AC_ARG_WITH(egd-pool,
        ]
 )
 
+# detect pathnames for entropy gathering commands, if we need them
+INSTALL_SSH_PRNG_CMDS=""
+rm -f prng_commands
 if test -z "$RANDOM_POOL" -a -z "$EGD_SOCKET" ; then
        # Use these commands to collect entropy
-       AC_PATH_PROG(PROG_LS, ls)
-       AC_PATH_PROG(PROG_NETSTAT, netstat)
-       AC_PATH_PROG(PROG_ARP, arp)
-       AC_PATH_PROG(PROG_IFCONFIG, ifconfig)
-       AC_PATH_PROG(PROG_PS, ps)
-       AC_PATH_PROG(PROG_W, w)
-       AC_PATH_PROG(PROG_WHO, who)
-       AC_PATH_PROG(PROG_LAST, last)
-       AC_PATH_PROG(PROG_LASTLOG, lastlog)
-       AC_PATH_PROG(PROG_DF, df)
-       AC_PATH_PROG(PROG_VMSTAT, vmstat)
-       AC_PATH_PROG(PROG_UPTIME, uptime)
-       AC_PATH_PROG(PROG_IPCS, ipcs)
-       AC_PATH_PROG(PROG_TAIL, tail)
-       AC_PATH_PROG(PROG_LS, ls)
-       if test ! -z "$PROG_LS" ; then 
-               AC_DEFINE_UNQUOTED(PROG_LS, "$PROG_LS") 
-       fi
-       if test ! -z "$PROG_NETSTAT" ; then 
-               AC_DEFINE_UNQUOTED(PROG_NETSTAT, "$PROG_NETSTAT") 
-       fi
-       if test ! -z "$PROG_ARP" ; then 
-               AC_DEFINE_UNQUOTED(PROG_ARP, "$PROG_ARP") 
-       fi
-       if test ! -z "$PROG_IFCONFIG" ; then 
-               AC_DEFINE_UNQUOTED(PROG_IFCONFIG, "$PROG_IFCONFIG") 
-       fi
-       if test ! -z "$PROG_PS" ; then 
-               AC_DEFINE_UNQUOTED(PROG_PS, "$PROG_PS") 
-       fi
-       if test ! -z "$PROG_W" ; then 
-               AC_DEFINE_UNQUOTED(PROG_W, "$PROG_W") 
-       fi
-       if test ! -z "$PROG_WHO" ; then 
-               AC_DEFINE_UNQUOTED(PROG_WHO, "$PROG_WHO") 
-       fi
-       if test ! -z "$PROG_LAST" ; then 
-               AC_DEFINE_UNQUOTED(PROG_LAST, "$PROG_LAST") 
-       fi
-       if test ! -z "$PROG_LASTLOG" ; then 
-               AC_DEFINE_UNQUOTED(PROG_LASTLOG, "$PROG_LASTLOG") 
-       fi
-       if test ! -z "$PROG_DF" ; then 
-               AC_DEFINE_UNQUOTED(PROG_DF, "$PROG_DF") 
-       fi
-       if test ! -z "$PROG_VMSTAT" ; then 
-               AC_DEFINE_UNQUOTED(PROG_VMSTAT, "$PROG_VMSTAT") 
-       fi
-       if test ! -z "$PROG_UPTIME" ; then 
-               AC_DEFINE_UNQUOTED(PROG_UPTIME, "$PROG_UPTIME") 
-       fi
-       if test ! -z "$PROG_UPTIME" ; then
-               AC_DEFINE_UNQUOTED(PROG_UPTIME, "$PROG_UPTIME") 
-       fi
-       if test ! -z "$PROG_TAIL" ; then
-               AC_DEFINE_UNQUOTED(PROG_TAIL, "$PROG_TAIL") 
-       fi
+       OSSH_PATH_ENTROPY_PROG(PROG_LS, ls)
+       OSSH_PATH_ENTROPY_PROG(PROG_NETSTAT, netstat)
+       OSSH_PATH_ENTROPY_PROG(PROG_ARP, arp)
+       OSSH_PATH_ENTROPY_PROG(PROG_IFCONFIG, ifconfig)
+       OSSH_PATH_ENTROPY_PROG(PROG_PS, ps)
+       OSSH_PATH_ENTROPY_PROG(PROG_W, w)
+       OSSH_PATH_ENTROPY_PROG(PROG_WHO, who)
+       OSSH_PATH_ENTROPY_PROG(PROG_LAST, last)
+       OSSH_PATH_ENTROPY_PROG(PROG_LASTLOG, lastlog)
+       OSSH_PATH_ENTROPY_PROG(PROG_DF, df)
+       OSSH_PATH_ENTROPY_PROG(PROG_VMSTAT, vmstat)
+       OSSH_PATH_ENTROPY_PROG(PROG_UPTIME, uptime)
+       OSSH_PATH_ENTROPY_PROG(PROG_IPCS, ipcs)
+       OSSH_PATH_ENTROPY_PROG(PROG_TAIL, tail)
+       OSSH_PATH_ENTROPY_PROG(PROG_LS, ls)
+
+       INSTALL_SSH_PRNG_CMDS="yes"
 fi
+AC_SUBST(INSTALL_SSH_PRNG_CMDS)
+
 
 AC_ARG_WITH(catman,
        [  --with-catman=man|cat   Install preformatted manpages[no]],
@@ -796,7 +829,7 @@ AC_ARG_WITH(tcp-wrappers,
                        AC_MSG_CHECKING(for libwrap)
                        AC_TRY_LINK(
                                [
-                                       #include <tcpd.h>
+#include <tcpd.h>
                                        int deny_severity = 0, allow_severity = 0;
                                ],
                                [hosts_access(0);],
@@ -824,16 +857,6 @@ AC_ARG_WITH(md5-passwords,
        ]
 )
 
-# Check whether to enable utmpx support
-AC_ARG_WITH(utmpx,
-       [  --with-utmpx            Enable utmpx support],
-       [
-               if test "x$withval" != "xno" ; then
-                       AC_DEFINE(USE_UTMPX)
-               fi
-       ]
-)
-
 # Whether to disable shadow password support
 AC_ARG_WITH(shadow,
        [  --without-shadow        Disable shadow password support],
@@ -874,7 +897,7 @@ AC_ARG_WITH(ipv4-default,
        ]
 )
 
-AC_MSG_CHECKING([to convert IPv4 in IPv6-mapped addresses])
+AC_MSG_CHECKING([if we need to convert IPv4 in IPv6-mapped addresses])
 AC_ARG_WITH(4in6,
        [  --with-4in6             Check for and convert IPv4 in IPv6 mapped addresses],
        [
@@ -904,12 +927,239 @@ AC_ARG_WITH(pid-dir,
                fi
        ]
 )
+
 AC_DEFINE_UNQUOTED(PIDDIR, "$piddir")
 AC_SUBST(piddir)
 
+dnl allow user to disable some login recording features
+AC_ARG_ENABLE(lastlog,
+       [ --disable-lastlog        disable use of lastlog even if detected [no]],
+       [ AC_DEFINE(DISABLE_LASTLOG) ]
+)
+AC_ARG_ENABLE(utmp,
+       [ --disable-utmp           disable use of utmp even if detected [no]],
+       [ AC_DEFINE(DISABLE_UTMP) ]
+)
+AC_ARG_ENABLE(utmpx,
+       [ --disable-utmpx          disable use of utmpx even if detected [no]],
+       [ AC_DEFINE(DISABLE_UTMPX) ]
+)
+AC_ARG_ENABLE(wtmp,
+       [ --disable-wtmp           disable use of wtmp even if detected [no]],
+       [ AC_DEFINE(DISABLE_WTMP) ]
+)
+AC_ARG_ENABLE(wtmpx,
+       [ --disable-wtmpx          disable use of wtmpx even if detected [no]],
+       [ AC_DEFINE(DISABLE_WTMPX) ]
+)
+AC_ARG_ENABLE(libutil,
+       [ --disable-libutil        disable use of libutil (login() etc.) [no]],
+       [ AC_DEFINE(DISABLE_LOGIN) ]
+)
+AC_ARG_ENABLE(pututline,
+       [ --disable-pututline      disable use of pututline() etc. ([uw]tmp) [no]],
+       [ AC_DEFINE(DISABLE_PUTUTLINE) ]
+)
+AC_ARG_ENABLE(pututxline,
+       [ --disable-pututxline      disable use of pututxline() etc. ([uw]tmpx) [no]],
+       [ AC_DEFINE(DISABLE_PUTUTXLINE) ]
+)
+AC_ARG_WITH(lastlog,
+  [ --with-lastlog=FILE|DIR  specify lastlog location [common locations]],
+  [ conf_lastlog_location="$withval";  ],)
+
+dnl lastlog, [uw]tmpx? detection
+dnl  NOTE: set the paths in the platform section to avoid the
+dnl   need for command-line parameters
+dnl lastlog and [uw]tmp are subject to a file search if all else fails
+
+dnl lastlog detection
+dnl  NOTE: the code itself will detect if lastlog is a directory
+AC_MSG_CHECKING([if your system defines LASTLOG_FILE])
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <utmp.h>
+#ifdef HAVE_LASTLOG_H
+#  include <lastlog.h>
+#endif
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
+       ],
+       [ char *lastlog = LASTLOG_FILE; ],
+       [ AC_MSG_RESULT(yes) ],
+       [
+               AC_MSG_RESULT(no)
+               AC_MSG_CHECKING([if your system defines _PATH_LASTLOG])
+               AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <utmp.h>
+#ifdef HAVE_LASTLOG_H
+#  include <lastlog.h>
+#endif
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
+               ],
+               [ char *lastlog = _PATH_LASTLOG; ],
+               [ AC_MSG_RESULT(yes) ],
+               [
+                       AC_MSG_RESULT(no)
+                       system_lastlog_path=no
+               ])
+       ]
+)
+
+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 -f "$f" ; then
+                                       conf_lastlog_location=$f
+                               fi
+               done
+               if test -z "$conf_lastlog_location"; then
+                       AC_MSG_WARN([** Cannot find lastlog **])
+                       dnl Don't define DISABLE_LASTLOG - that means we don't try wtmp/wtmpx
+               fi
+       fi
+fi
+
+if test -n "$conf_lastlog_location"; then
+       AC_DEFINE_UNQUOTED(CONF_LASTLOG_FILE, "$conf_lastlog_location")
+fi     
+
+dnl utmp detection
+AC_MSG_CHECKING([if your system defines UTMP_FILE])
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <utmp.h>
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
+       ],
+       [ char *utmp = UTMP_FILE; ],
+       [ AC_MSG_RESULT(yes) ],
+       [ AC_MSG_RESULT(no)
+         system_utmp_path=no ]
+)
+if test -z "$conf_utmp_location"; then
+       if test x"$system_utmp_path" = x"no" ; then
+               for f in /etc/utmp /usr/adm/utmp /var/run/utmp; do
+                       if test -f $f ; then
+                               conf_utmp_location=$f
+                       fi
+               done
+               if test -z "$conf_utmp_location"; then
+                       AC_DEFINE(DISABLE_UTMP)
+               fi
+       fi
+fi
+if test -n "$conf_utmp_location"; then
+       AC_DEFINE_UNQUOTED(CONF_UTMP_FILE, "$conf_utmp_location")
+fi     
+
+dnl wtmp detection
+AC_MSG_CHECKING([if your system defines WTMP_FILE])
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <utmp.h>
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
+       ],
+       [ char *wtmp = WTMP_FILE; ],
+       [ AC_MSG_RESULT(yes) ],
+       [ AC_MSG_RESULT(no)
+         system_wtmp_path=no ]
+)
+if test -z "$conf_wtmp_location"; then
+       if test x"$system_wtmp_path" = x"no" ; then
+               for f in /usr/adm/wtmp /var/log/wtmp; do
+                       if test -f $f ; then
+                               conf_wtmp_location=$f
+                       fi
+               done
+               if test -z "$conf_wtmp_location"; then
+                       AC_DEFINE(DISABLE_WTMP)
+               fi
+       fi
+fi
+if test -n "$conf_wtmp_location"; then
+       AC_DEFINE_UNQUOTED(CONF_WTMP_FILE, "$conf_wtmp_location")
+fi     
+
+
+dnl utmpx detection - I don't know any system so perverse as to require
+dnl  utmpx, but not define UTMPX_FILE (ditto wtmpx.) No doubt it's out
+dnl  there, though.
+AC_MSG_CHECKING([if your system defines UTMPX_FILE])
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <utmp.h>
+#ifdef HAVE_UTMPX_H
+#include <utmpx.h>
+#endif
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
+       ],
+       [ char *utmpx = UTMPX_FILE; ],
+       [ AC_MSG_RESULT(yes) ],
+       [ AC_MSG_RESULT(no)
+         system_utmpx_path=no ]
+)
+if test -z "$conf_utmpx_location"; then
+       if test x"$system_utmpx_path" = x"no" ; then
+               AC_DEFINE(DISABLE_UTMPX)
+       fi
+else
+       AC_DEFINE_UNQUOTED(CONF_UTMPX_FILE, "$conf_utmpx_location")
+fi     
+
+dnl wtmpx detection
+AC_MSG_CHECKING([if your system defines WTMPX_FILE])
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <utmp.h>
+#ifdef HAVE_UTMPX_H
+#include <utmpx.h>
+#endif
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
+       ],
+       [ char *wtmpx = WTMPX_FILE; ],
+       [ AC_MSG_RESULT(yes) ],
+       [ AC_MSG_RESULT(no)
+         system_wtmpx_path=no ]
+)
+if test -z "$conf_wtmpx_location"; then
+       if test x"$system_wtmpx_path" = x"no" ; then
+               AC_DEFINE(DISABLE_WTMPX)
+       fi
+else
+       AC_DEFINE_UNQUOTED(CONF_WTMPX_FILE, "$conf_wtmpx_location")
+fi     
+
+
+# Change default command timeout for builtin PRNG
+entropy_timeout=200
+AC_ARG_WITH(entropy-timeout,
+       [  --with-entropy-timeout  Specify entropy gathering command timeout (msec)],
+       [
+               if test "x$withval" != "xno" ; then
+                       entropy_timeout=$withval
+               fi
+       ]       
+)
+AC_DEFINE_UNQUOTED(ENTROPY_TIMEOUT_MSEC, $entropy_timeout)
+
+
 if test ! -z "$blibpath" ; then
        LDFLAGS="$LDFLAGS -blibpath:$blibpath"
        AC_MSG_WARN([Please check and edit -blibpath in LDFLAGS in Makefile])
 fi
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile ssh_prng_cmds)
+
+
This page took 0.152781 seconds and 4 git commands to generate.