- Integrate Andre Lucas' <andre.lucas@dial.pipex.com> entropy collection

[openssh.git] / configure.in

diff --git a/configure.in b/configure.in
index 095c967375a98ade17256e45c73655992553252a..c533d4209ab3efa7449bce773729bf98b9958281 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -43,6 +43,29 @@ case "$host" in
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        AC_DEFINE(IPADDR_IN_DISPLAY)
        AC_DEFINE(USE_UTMPX)
+       AC_DEFINE(NEED_IN_SYSTM_H)
+       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)
@@ -140,6 +163,8 @@ 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_FUNC(pam_getenvlist)
+
        # Check PAM strerror arguments (old PAM)
        AC_MSG_CHECKING([whether pam_strerror takes only one argument])
        AC_TRY_COMPILE(
@@ -883,9 +908,24 @@ AC_ARG_WITH(pid-dir,
                fi
        ]
 )
+
 AC_DEFINE_UNQUOTED(PIDDIR, "$piddir")
 AC_SUBST(piddir)
 
+
+# Change default command timeout for builtin PRNG
+entropy_timeout=100
+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])