]> andersk Git - openssh.git/blobdiff - configure.in
- djm@cvs.openbsd.org 2001/03/13 22:42:54
[openssh.git] / configure.in
index e55006152f0f710a713a3cfc1e1b700df36bc8c7..e84ae69f79a9d03e7df427e628635d1064a51a27 100644 (file)
@@ -5,6 +5,7 @@ AC_INIT(ssh.c)
 AC_CONFIG_HEADER(config.h)
 AC_PROG_CC
 AC_CANONICAL_HOST
+AC_C_BIGENDIAN
 
 # Checks for programs.
 AC_PROG_CPP
@@ -71,9 +72,13 @@ case "$host" in
        AC_DEFINE(IPV4_DEFAULT)
        AC_DEFINE(IP_TOS_IS_BROKEN)
        AC_DEFINE(BROKEN_VHANGUP)
+       AC_DEFINE(NO_X11_UNIX_SOCKETS)
        no_libsocket=1
        no_libnsl=1
        ;;
+*-*-dgux*)
+       AC_DEFINE(IP_TOS_IS_BROKEN)
+       ;;
 *-*-hpux10*)
        if test -z "$GCC"; then
                CFLAGS="$CFLAGS -Ae"
@@ -134,12 +139,15 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(HAVE_NEWS4)
        SONY=1
        AC_CHECK_LIB(iberty, xatexit, AC_DEFINE(HAVE_XATEXIT),
-               AC_MSG_ERROR([*** libiberty missing - please install first ***])
+               AC_MSG_ERROR([*** libiberty missing - please install first or check config.log ***])
         )
        ;;
 *-*-netbsd*)
        need_dash_r=1
        ;;
+*-*-freebsd*)
+       check_for_libcrypt_later=1
+       ;;
 *-next-*)
        conf_lastlog_location="/usr/adm/lastlog"
        conf_utmp_location=/etc/utmp
@@ -148,12 +156,13 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(HAVE_NEXT)
        AC_DEFINE(BROKEN_REALPATH)
        AC_DEFINE(USE_PIPES)
+       AC_DEFINE(BROKEN_SAVED_UIDS)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        CFLAGS="$CFLAGS"
        ;;
 *-*-solaris*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-       LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib -L/usr/ucblib -R/usr/ucblib"
+       LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib
        need_dash_r=1
        AC_DEFINE(PAM_SUN_CODEBASE)
        # hardwire lastlog location (can't detect it on some versions)
@@ -172,6 +181,7 @@ mips-sony-bsd|mips-sony-newsos4)
        CPPFLAGS="$CPPFLAGS -DSUNOS4"
        AC_CHECK_FUNCS(getpwanam)
        AC_DEFINE(PAM_SUN_CODEBASE)
+       AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
        conf_utmp_location=/etc/utmp
        conf_wtmp_location=/var/adm/wtmp
        conf_lastlog_location=/var/adm/lastlog
@@ -193,6 +203,7 @@ mips-sony-bsd|mips-sony-newsos4)
        IPADDR_IN_DISPLAY=yes
        AC_DEFINE(USE_PIPES)
        AC_DEFINE(IP_TOS_IS_BROKEN)
+       AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
        mansubdir=cat
        LIBS="$LIBS -lgen -lnsl -lucb"
        ;;
@@ -202,6 +213,7 @@ mips-sony-bsd|mips-sony-newsos4)
        MANTYPE='$(CATMAN)'
        mansubdir=cat
        enable_suid_ssh=no
+       AC_DEFINE(USE_PIPES)
        ;;
 *-*-sysv5*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
@@ -209,6 +221,7 @@ mips-sony-bsd|mips-sony-newsos4)
        MANTYPE='$(CATMAN)'
        mansubdir=cat
        enable_suid_ssh=no
+       AC_DEFINE(USE_PIPES)
        ;;
 *-*-sysv*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
@@ -218,35 +231,37 @@ mips-sony-bsd|mips-sony-newsos4)
        LIBS="$LIBS -lgen -lsocket"
        ;;
 *-*-sco3.2v4*)
-       AC_DEFINE(USE_PIPES)
        CPPFLAGS="$CPPFLAGS -Dftruncate=chsize -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        MANTYPE='$(CATMAN)'
-       mansubdir=cat
        LIBS="$LIBS -lgen -lsocket -los -lprot -lx -ltinfo -lm"
-       no_dev_ptmx=1
+       mansubdir=cat
+       rsh_path="/usr/bin/rcmd"
        RANLIB=true
+       no_dev_ptmx=1
        AC_DEFINE(BROKEN_SYS_TERMIO_H)
-       rsh_path="/usr/bin/rcmd"
+       AC_DEFINE(USE_PIPES)
        AC_DEFINE(HAVE_SCO_PROTECTED_PW)
        AC_DEFINE(DISABLE_SHADOW)
        AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
+       AC_DEFINE(BROKEN_SAVED_UIDS)
+       AC_CHECK_FUNCS(getluid setluid)
        ;;
 *-*-sco3.2v5*)
-       AC_DEFINE(USE_PIPES)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
+       LIBS="$LIBS -lprot -lx -ltinfo -lm"
        MANTYPE='$(CATMAN)'
        mansubdir=cat
-       LIBS="$LIBS -lprot -lx -ltinfo -lm"
        no_dev_ptmx=1
        rsh_path="/usr/bin/rcmd"
+       AC_DEFINE(USE_PIPES)
        AC_DEFINE(HAVE_SCO_PROTECTED_PW)
        AC_DEFINE(DISABLE_SHADOW)
        AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
+       AC_CHECK_FUNCS(getluid setluid)
        ;;
 *-dec-osf*)
-# This is untested
        if test ! -z "USE_SIA" ; then
                AC_MSG_CHECKING(for Digital Unix Security Integration Architecture)
                if test -f /etc/sia/matrix.conf; then
@@ -295,26 +310,52 @@ AC_ARG_WITH(libs,
        ]       
 )
 
+AC_ARG_WITH(pcre,
+       [  --with-pcre             Override built in regex library with pcre],
+       [
+
+               AC_CHECK_LIB(pcre, pcre_info, 
+                       [ 
+                               AC_DEFINE(HAVE_LIBPCRE) 
+                               LIBS="$LIBS -lpcreposix -lpcre" 
+                               no_comp_check="yes"
+                       ],
+                       [ AC_MSG_ERROR([*** Can not locate pcre libraries.]) ]
+               )
+       ]       
+)
 
 # Checks for libraries.
-if test -z "$no_libsocket" ; then
+if test -z "$no_libnsl" ; then
        AC_CHECK_LIB(nsl, yp_match, , )
 fi
-if test -z "$no_libnsl" ; then
+if test -z "$no_libsocket" ; then
        AC_CHECK_LIB(socket, main, , )
 fi
 
+dnl SCO OS3 needs this for libwrap
+AC_CHECK_LIB(rpc, innetgr, LIBS="-lrpc -lyp -lrpc $LIBS" , , -lyp -lrpc)
+
 AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen")
-AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first ***]))
+AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first or check config.log ***]))
 AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil")
 
-AC_CHECK_FUNC(regcomp, 
-       [ AC_DEFINE(HAVE_REGCOMP)],
-       [
-               AC_CHECK_LIB(pcre, pcre_info, 
-                       AC_DEFINE(HAVE_LIBPCRE) LIBS="$LIBS -lpcreposix -lpcre")
-       ]
-)
+# We don't want to check if we did an pcre override.
+if test -z "$no_comp_check" ; then
+       AC_CHECK_FUNC(regcomp, 
+               [ AC_DEFINE(HAVE_REGCOMP)],
+               [
+                       AC_CHECK_LIB(pcre, pcre_info, 
+                       [
+                               AC_DEFINE(HAVE_LIBPCRE)
+                               LIBS="$LIBS -lpcreposix -lpcre"
+                       ],
+                       [
+                               AC_MSG_ERROR([*** No regex library found.])
+                       ])
+               ]
+       )
+fi
 
 dnl UnixWare 2.x
 AC_CHECK_FUNC(strcasecmp, 
@@ -324,8 +365,130 @@ AC_CHECK_FUNC(utimes,
        [], [ AC_CHECK_LIB(c89, utimes, LIBS="$LIBS -lc89") ]
 )
 
+AC_FUNC_STRFTIME
+
 # Checks for header files.
-AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h regex.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stdarg.h stddef.h time.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h)
+AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h regex.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h)
+
+# Check whether user wants Kerberos support
+KRB4_MSG="no" 
+AC_ARG_WITH(kerberos4,
+       [  --with-kerberos4=PATH   Enable Kerberos 4 support],
+       [
+               if test "x$withval" != "xno" ; then
+       
+                       if test "x$withval" != "xyes" ; then
+                               CPPFLAGS="$CPPFLAGS -I${withval}/include"
+                               LDFLAGS="$LDFLAGS -L${withval}/lib"
+                               if test ! -z "$need_dash_r" ; then
+                                       LDFLAGS="$LDFLAGS -R${withval}/lib"
+                               fi
+                               if test ! -z "$blibpath" ; then
+                                       blibpath="$blibpath:${withval}/lib"
+                               fi
+                       else
+                               if test -d /usr/include/kerberosIV ; then
+                                       CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV"
+                               fi
+                       fi
+
+                       AC_CHECK_HEADERS(krb.h)
+                       AC_CHECK_LIB(krb, main)
+                       if test "$ac_cv_header_krb_h" != yes; then
+                               AC_MSG_WARN([Cannot find krb.h, build may fail])
+                       fi
+                       if test "$ac_cv_lib_krb_main" != yes; then
+                               AC_MSG_WARN([Cannot find libkrb, build may fail])
+                       fi
+
+                       KLIBS="-lkrb -ldes"
+                       AC_CHECK_LIB(resolv, dn_expand, , )
+                       KRB4=yes
+                       KRB4_MSG="yes" 
+                       AC_DEFINE(KRB4)
+               fi
+       ]
+)
+
+# Check whether user wants AFS support
+AFS_MSG="no" 
+AC_ARG_WITH(afs,
+       [  --with-afs=PATH         Enable AFS support],
+       [
+               if test "x$withval" != "xno" ; then
+
+                       if test "x$withval" != "xyes" ; then
+                               CPPFLAGS="$CPPFLAGS -I${withval}/include"
+                               LDFLAGS="$LDFLAGS -L${withval}/lib"
+                       fi
+
+                       if test -z "$KRB4" ; then
+                               AC_MSG_WARN([AFS requires Kerberos IV support, build may fail])
+                       fi
+
+                       LIBS="$LIBS -lkafs"
+                       if test ! -z "$AFS_LIBS" ; then
+                               LIBS="$LIBS $AFS_LIBS"
+                       fi
+                       AC_DEFINE(AFS)
+                       AFS_MSG="yes" 
+               fi
+       ]
+)
+LIBS="$LIBS $KLIBS"
+
+# Check whether user wants S/Key support
+SKEY_MSG="no" 
+AC_ARG_WITH(skey,
+       [  --with-skey=PATH         Enable S/Key support],
+       [
+               if test "x$withval" != "xno" ; then
+
+                       if test "x$withval" != "xyes" ; then
+                               CPPFLAGS="$CPPFLAGS -I${withval}/include"
+                               LDFLAGS="$LDFLAGS -L${withval}/lib"
+                       fi
+
+                       AC_DEFINE(SKEY)
+                       LIBS="-lskey $LIBS"
+                       SKEY_MSG="yes" 
+       
+                       AC_CHECK_FUNC(skey_keyinfo,
+                               [],
+                               [
+                                       AC_MSG_ERROR([** Incomplete or missing s/key libraries.])
+                               ])
+               fi
+       ]
+)
+
+# Check whether user wants TCP wrappers support
+TCPW_MSG="no" 
+AC_ARG_WITH(tcp-wrappers,
+       [  --with-tcp-wrappers     Enable tcpwrappers support],
+       [
+               if test "x$withval" != "xno" ; then
+                       saved_LIBS="$LIBS"
+                       LIBS="-lwrap $LIBS"
+                       AC_MSG_CHECKING(for libwrap)
+                       AC_TRY_LINK(
+                               [
+#include <tcpd.h>
+                                       int deny_severity = 0, allow_severity = 0;
+                               ],
+                               [hosts_access(0);],
+                               [
+                                       AC_MSG_RESULT(yes)
+                                       AC_DEFINE(LIBWRAP)
+                                       TCPW_MSG="yes" 
+                               ],
+                               [
+                                       AC_MSG_ERROR([*** libwrap missing])
+                               ]
+                       )
+               fi
+       ]
+)
 
 dnl    Checks for library functions.
 AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv seteuid setlogin setproctitle setreuid setrlimit setsid sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop)
@@ -380,8 +543,6 @@ fi
 
 AC_FUNC_GETPGRP
 
-AC_FUNC_STRFTIME
-
 # Check for PAM libs
 PAM_MSG="no"
 AC_ARG_WITH(pam,
@@ -440,20 +601,38 @@ if test "x$prefix" != "xNONE" ; then
        tryssldir="$tryssldir $prefix"
 fi
 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
+               CPPFLAGS="$saved_CPPFLAGS"
+               LDFLAGS="$saved_LDFLAGS"
+               LIBS="$saved_LIBS -lcrypto"
+               
+               # Skip directories if they don't exist
+               if test ! -z "$ssldir" -a ! -d "$ssldir" ; then
+                       continue;
+               fi
                if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then
-                       LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
-                       CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
-                       if test ! -z "$need_dash_r" ; then
-                               LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
+                       # Try to use $ssldir/lib if it exists, otherwise 
+                       # $ssldir
+                       if test -d "$ssldir/lib" ; then
+                               LDFLAGS="$saved_LDFLAGS -L$ssldir/lib"
+                               if test ! -z "$need_dash_r" ; then
+                                       LDFLAGS="$LDFLAGS -R$ssldir/lib"
+                               fi
+                       else
+                               LDFLAGS="$saved_LDFLAGS -L$ssldir"
+                               if test ! -z "$need_dash_r" ; then
+                                       LDFLAGS="$LDFLAGS -R$ssldir"
+                               fi
+                       fi
+                       # Try to use $ssldir/include if it exists, otherwise 
+                       # $ssldir
+                       if test -d "$ssldir/include" ; then
+                               CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
+                       else
+                               CPPFLAGS="$saved_CPPFLAGS -I$ssldir"
                        fi
-               else
-                       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(
@@ -480,7 +659,7 @@ int main(void)
        done
 
        if test -z "$found_crypto" ; then
-               AC_MSG_ERROR([Could not find working SSLeay / OpenSSL libraries, please install])       
+               AC_MSG_ERROR([Could not find working OpenSSL library, please install or check config.log])      
        fi
        if test -z "$ssldir" ; then
                ssldir="(system)"
@@ -493,15 +672,26 @@ if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ;
        AC_DEFINE(HAVE_OPENSSL)
        dnl Need to recover ssldir - test above runs in subshell
        ssldir=$ac_cv_openssldir
-
        if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then
-               CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
-               LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
-               if test ! -z "$need_dash_r" ; then
-                       LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
+               # Try to use $ssldir/lib if it exists, otherwise 
+               # $ssldir
+               if test -d "$ssldir/lib" ; then
+                       LDFLAGS="$saved_LDFLAGS -L$ssldir/lib"
+                       if test ! -z "$need_dash_r" ; then
+                               LDFLAGS="$LDFLAGS -R$ssldir/lib"
+                       fi
+               else
+                       LDFLAGS="$saved_LDFLAGS -L$ssldir"
+                       if test ! -z "$need_dash_r" ; then
+                               LDFLAGS="$LDFLAGS -R$ssldir"
+                       fi
                fi
-               if test ! -z "$blibpath" ; then
-                       blibpath="$blibpath:$ssldir:$ssldir/lib"
+               # Try to use $ssldir/include if it exists, otherwise 
+               # $ssldir
+               if test -d "$ssldir/include" ; then
+                       CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
+               else
+                       CPPFLAGS="$saved_CPPFLAGS -I$ssldir"
                fi
        fi
 fi
@@ -560,7 +750,7 @@ fi
 # Some Linux systems (Slackware) need crypt() from libcrypt, *not* the 
 # version in OpenSSL. Skip this for PAM
 if test "x$PAM_MSG" = "xno" -a "x$check_for_libcrypt_later" = "x1"; then
-       AC_CHECK_LIB(crypt, crypt, )
+       AC_CHECK_LIB(crypt, crypt, LIBS="$LIBS -lcrypt")
 fi
 
 # Cheap hack to ensure NEWS-OS libraries are arranged right.
@@ -870,6 +1060,34 @@ if test "x$ac_cv_have_int64_t" = "xno" -a \
        "x$ac_cv_sizeof_long_int" != "x8" -a \
        "x$ac_cv_sizeof_long_long_int" = "x0" ; then
        NO_SFTP='#'
+else
+dnl test snprintf (broken on SCO w/gcc)
+       AC_TRY_RUN(
+               [
+#include <stdio.h>
+#include <string.h>
+#ifdef HAVE_SNPRINTF
+main()
+{
+       char buf[50];
+       char expected_out[50];
+       int mazsize = 50 ;
+#if (SIZEOF_LONG_INT == 8)
+       long int num = 0x7fffffffffffffff;
+#else
+       long long num = 0x7fffffffffffffff;
+#endif
+       strcpy(expected_out, "9223372036854775807");
+       snprintf(buf, mazsize, "%lld", num);
+       if(strcmp(buf, expected_out) != 0)
+               exit(1);
+       exit(0);
+}
+#else
+main() { exit(0); }
+#endif
+               ], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ]
+       )
 fi
 AC_SUBST(NO_SFTP)
 
@@ -1077,13 +1295,24 @@ AC_ARG_WITH(random,
        ]
 )
 
-# Check for EGD pool file
-AC_ARG_WITH(egd-pool,
-       [  --with-egd-pool=FILE    read entropy from PRNGD/EGD socket FILE (default=/var/run/egd-pool)],
+# Check for PRNGD/EGD pool file
+AC_ARG_WITH(prngd-port,
+       [  --with-prngd-port=PORT  read entropy from PRNGD/EGD localhost:PORT],
+       [
+               if test ! -z "$withval" -a "x$withval" != "xno" ; then
+                       PRNGD_PORT="$withval"
+                       AC_DEFINE_UNQUOTED(PRNGD_PORT, $PRNGD_PORT)
+               fi
+       ]
+)
+
+# Check for PRNGD/EGD pool file
+AC_ARG_WITH(prngd-socket,
+       [  --with-prngd-socket=FILE read entropy from PRNGD/EGD socket FILE (default=/var/run/egd-pool)],
        [
                if test "x$withval" != "xno" ; then
-                       EGD_SOCKET="$withval";
-                       AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET")
+                       PRNGD_SOCKET="$withval"
+                       AC_DEFINE_UNQUOTED(PRNGD_SOCKET, "$PRNGD_SOCKET")
                fi
        ],
        [
@@ -1091,15 +1320,15 @@ AC_ARG_WITH(egd-pool,
                if test -z "$RANDOM_POOL" ; then
                        AC_MSG_CHECKING(for PRNGD/EGD socket)
                        # Insert other locations here
-                       for egdsock in /var/run/egd-pool /etc/entropy /tmp/entropy ; do
-                               if test -r $egdsock && $TEST_MINUS_S_SH -c "test -S $egdsock -o -p $egdsock" ; then
-                                       EGD_SOCKET="$egdsock"
-                                       AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET")
+                       for sock in /var/run/egd-pool /dev/egd-pool /etc/entropy; do
+                               if test -r $sock && $TEST_MINUS_S_SH -c "test -S $sock -o -p $sock" ; then
+                                       PRNGD_SOCKET="$sock"
+                                       AC_DEFINE_UNQUOTED(PRNGD_SOCKET, "$PRNGD_SOCKET")
                                        break;
                                fi
                        done
-                       if test -x "$EGD_SOCKET" ; then
-                               AC_MSG_RESULT($EGD_SOCKET)
+                       if test ! -z "$PRNGD_SOCKET" ; then
+                               AC_MSG_RESULT($PRNGD_SOCKET)
                        else
                                AC_MSG_RESULT(not found)
                        fi
@@ -1111,7 +1340,7 @@ 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" && test -z "$EGD_SOCKET") ; then
+if (test -z "$RANDOM_POOL" && test -z "$PRNGD") ; then
        # Use these commands to collect entropy
        OSSH_PATH_ENTROPY_PROG(PROG_LS, ls)
        OSSH_PATH_ENTROPY_PROG(PROG_NETSTAT, netstat)
@@ -1152,126 +1381,6 @@ AC_ARG_WITH(catman,
 AC_SUBST(MANTYPE)
 AC_SUBST(mansubdir)
 
-# Check whether user wants Kerberos support
-KRB4_MSG="no" 
-AC_ARG_WITH(kerberos4,
-       [  --with-kerberos4=PATH   Enable Kerberos 4 support],
-       [
-               if test "x$withval" != "xno" ; then
-       
-                       if test "x$withval" != "xyes" ; then
-                               CPPFLAGS="$CPPFLAGS -I${withval}/include"
-                               LDFLAGS="$LDFLAGS -L${withval}/lib"
-                               if test ! -z "$need_dash_r" ; then
-                                       LDFLAGS="$LDFLAGS -R${withval}/lib"
-                               fi
-                               if test ! -z "$blibpath" ; then
-                                       blibpath="$blibpath:${withval}/lib"
-                               fi
-                       else
-                               if test -d /usr/include/kerberosIV ; then
-                                       CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV"
-                               fi
-                       fi
-
-                       AC_CHECK_HEADERS(krb.h)
-                       AC_CHECK_LIB(krb, main)
-                       if test "$ac_cv_header_krb_h" != yes; then
-                               AC_MSG_WARN([Cannot find krb.h, build may fail])
-                       fi
-                       if test "$ac_cv_lib_krb_main" != yes; then
-                               AC_MSG_WARN([Cannot find libkrb, build may fail])
-                       fi
-
-                       KLIBS="-lkrb -ldes"
-                       AC_CHECK_LIB(resolv, dn_expand, , )
-                       KRB4=yes
-                       KRB4_MSG="yes" 
-                       AC_DEFINE(KRB4)
-               fi
-       ]
-)
-
-# Check whether user wants AFS support
-AFS_MSG="no" 
-AC_ARG_WITH(afs,
-       [  --with-afs=PATH         Enable AFS support],
-       [
-               if test "x$withval" != "xno" ; then
-
-                       if test "x$withval" != "xyes" ; then
-                               CPPFLAGS="$CPPFLAGS -I${withval}/include"
-                               LDFLAGS="$LDFLAGS -L${withval}/lib"
-                       fi
-
-                       if test -z "$KRB4" ; then
-                               AC_MSG_WARN([AFS requires Kerberos IV support, build may fail])
-                       fi
-
-                       LIBS="$LIBS -lkafs"
-                       if test ! -z "$AFS_LIBS" ; then
-                               LIBS="$LIBS $AFS_LIBS"
-                       fi
-                       AC_DEFINE(AFS)
-                       AFS_MSG="yes" 
-               fi
-       ]
-)
-LIBS="$LIBS $KLIBS"
-
-# Check whether user wants S/Key support
-SKEY_MSG="no" 
-AC_ARG_WITH(skey,
-       [  --with-skey=PATH         Enable S/Key support],
-       [
-               if test "x$withval" != "xno" ; then
-
-                       if test "x$withval" != "xyes" ; then
-                               CPPFLAGS="$CPPFLAGS -I${withval}/include"
-                               LDFLAGS="$LDFLAGS -L${withval}/lib"
-                       fi
-
-                       AC_DEFINE(SKEY)
-                       LIBS="-lskey $LIBS"
-                       SKEY_MSG="yes" 
-       
-                       AC_CHECK_FUNC(skey_keyinfo,
-                               [],
-                               [
-                                       AC_MSG_ERROR([** Incomplete or missing s/key libraries.])
-                               ])
-               fi
-       ]
-)
-
-# Check whether user wants TCP wrappers support
-TCPW_MSG="no" 
-AC_ARG_WITH(tcp-wrappers,
-       [  --with-tcp-wrappers     Enable tcpwrappers support],
-       [
-               if test "x$withval" != "xno" ; then
-                       saved_LIBS="$LIBS"
-                       LIBS="$LIBS -lwrap"
-                       AC_MSG_CHECKING(for libwrap)
-                       AC_TRY_LINK(
-                               [
-#include <tcpd.h>
-                                       int deny_severity = 0, allow_severity = 0;
-                               ],
-                               [hosts_access(0);],
-                               [
-                                       AC_MSG_RESULT(yes)
-                                       AC_DEFINE(LIBWRAP)
-                                       TCPW_MSG="yes" 
-                               ],
-                               [
-                                       AC_MSG_ERROR([*** libwrap missing])
-                               ]
-                       )
-               fi
-       ]
-)
-
 # Check whether to enable MD5 passwords
 MD5_MSG="no" 
 AC_ARG_WITH(md5-passwords,
@@ -1337,11 +1446,64 @@ AC_ARG_WITH(default-path,
        [  --with-default-path=PATH Specify default \$PATH environment for server],
        [
                if test "x$withval" != "xno" ; then     
-                       AC_DEFINE_UNQUOTED(USER_PATH, "$withval")
+                       user_path="$withval"
                        SERVER_PATH_MSG="$withval" 
                fi
+       ],
+       [
+       AC_TRY_RUN(
+               [
+/* find out what STDPATH is */
+#include <stdio.h>
+#ifdef HAVE_PATHS_H
+# include <paths.h>
+#endif
+#ifndef _PATH_STDPATH
+# define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin"
+#endif
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#define DATA "conftest.stdpath"
+
+main()
+{
+       FILE *fd;
+       int rc;
+       
+       fd = fopen(DATA,"w");
+       if(fd == NULL)
+               exit(1);
+       
+       if ((rc = fprintf(fd,"%s", _PATH_STDPATH)) < 0)
+               exit(1);
+
+       exit(0);
+}
+               ], [ user_path=`cat conftest.stdpath` ],
+               [ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ],
+               [ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ]
+       )
+# make sure $bindir is in USER_PATH so scp will work
+               t_bindir=`eval echo ${bindir}`
+               case $t_bindir in
+                       NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$prefix~"` ;;
+               esac
+               case $t_bindir in
+                       NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$ac_default_prefix~"` ;;
+               esac
+               echo $user_path | grep ":$t_bindir"  > /dev/null 2>&1
+               if test $? -ne 0  ; then
+                       echo $user_path | grep "^$t_bindir"  > /dev/null 2>&1
+                       if test $? -ne 0  ; then
+                               user_path=$user_path:$t_bindir
+                               AC_MSG_RESULT(Adding $t_bindir to USER_PATH so scp will work)
+                       fi
+               fi
        ]
 )
+AC_DEFINE_UNQUOTED(USER_PATH, "$user_path")
+AC_SUBST(user_path)
 
 # Whether to force IPv4 by default (needed on broken glibc Linux)
 IPV4_HACK_MSG="no" 
@@ -1378,6 +1540,17 @@ AC_ARG_WITH(4in6,
        ]
 )
 
+# Whether to enable BSD auth support
+AC_ARG_WITH(bsd-auth,
+       [  --with-bsd-auth         Enable BSD auth support],
+       [
+               if test "x$withval" != "xno" ; then     
+                       AC_DEFINE(BSD_AUTH)
+                       bsd_auth=yes
+               fi
+       ]
+)
+
 AC_MSG_CHECKING(whether to install ssh as suid root)
 AC_ARG_ENABLE(suid-ssh,
 [  --enable-suid-ssh       Install ssh as suid root (default)
@@ -1669,8 +1842,10 @@ fi
 if test ! -z "$RANDOM_POOL" ; then
        RAND_MSG="Device ($RANDOM_POOL)"
 else
-       if test ! -z "$EGD_SOCKET" ; then
-               RAND_MSG="EGD/PRNGD ($EGD_SOCKET)"
+       if test ! -z "$PRNGD_PORT" ; then
+               RAND_MSG="PRNGD/EGD (port localhost:$PRNGD_PORT)"
+       elif test ! -z "$PRNGD_SOCKET" ; then
+               RAND_MSG="PRNGD/EGD (socket $PRNGD_SOCKET)"
        else
                RAND_MSG="Builtin (timeout $entropy_timeout)"
                BUILTIN_RNG=1
@@ -1685,6 +1860,7 @@ D=`eval echo ${sysconfdir}` ; D=`eval echo ${D}`
 E=`eval echo ${libexecdir}/ssh-askpass` ; E=`eval echo ${E}`
 F=`eval echo ${mandir}/${mansubdir}X` ; F=`eval echo ${F}`
 G=`eval echo ${piddir}` ; G=`eval echo ${G}`
+H=`eval echo ${user_path}` ; H=`eval echo ${H}`
 
 echo ""
 echo "OpenSSH configured has been configured with the following options."
@@ -1694,6 +1870,7 @@ echo "           Configuration files: $D"
 echo "               Askpass program: $E"
 echo "                  Manual pages: $F"
 echo "                      PID file: $G"
+echo "        sshd default user PATH: $H"
 echo "      Random number collection: $RAND_MSG"
 echo "                Manpage format: $MAN_MSG"
 echo "                   PAM support: ${PAM_MSG}"
@@ -1706,6 +1883,10 @@ echo "   IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
 echo "      Use IPv4 by default hack: $IPV4_HACK_MSG"
 echo "       Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
 
+if test ! -z "$bsd_auth"; then
+       echo "              BSD Auth support: yes"
+fi
+
 echo ""
 
 echo "              Host: ${host}"
@@ -1736,3 +1917,4 @@ if test ! -z "$NO_SFTP"; then
        echo "64bit integers."
        echo ""
 fi
+
This page took 0.070001 seconds and 4 git commands to generate.