]> andersk Git - openssh.git/blobdiff - configure.in
- (bal) utimes() support via utime() interface on machine that lack utimes().
[openssh.git] / configure.in
index ace6de4b4795956f3806926749f3cf0685565392..82cb5d4bd12f96f0014becaa42d33ae90c647183 100644 (file)
@@ -13,6 +13,22 @@ AC_PATH_PROG(PERL, perl)
 AC_SUBST(PERL)
 AC_PATH_PROG(ENT, ent)
 AC_SUBST(ENT)
+AC_PATH_PROGS(FILEPRIV, filepriv, true, /sbin:/usr/sbin)
+
+if test -z "$AR" ; then
+       AC_MSG_ERROR([*** 'ar' missing, please install or fix your \$PATH ***])
+fi
+
+# Use LOGIN_PROGRAM from environment if possible
+if test ! -z "$LOGIN_PROGRAM" ; then
+       AC_DEFINE_UNQUOTED(LOGIN_PROGRAM_FALLBACK, "$LOGIN_PROGRAM")
+else
+       # Search for login
+       AC_PATH_PROG(LOGIN_PROGRAM_FALLBACK, login)
+       if test ! -z "$LOGIN_PROGRAM_FALLBACK" ; then
+               AC_DEFINE_UNQUOTED(LOGIN_PROGRAM_FALLBACK, "$LOGIN_PROGRAM_FALLBACK")
+       fi
+fi
 
 if test -z "$LD" ; then
        LD=$CC
@@ -29,7 +45,7 @@ fi
 case "$host" in
 *-*-aix*)
        AFS_LIBS="-lld"
-       CFLAGS="$CFLAGS -I/usr/local/include"
+       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        if (test "$LD" != "gcc" && test -z "$blibpath"); then
                blibpath="/usr/lib:/lib:/usr/local/lib"
@@ -40,85 +56,102 @@ case "$host" in
        mansubdir=cat
        dnl AIX handles lastlog as part of its login message
        AC_DEFINE(DISABLE_LASTLOG)
+       MANTYPE='$(CATMAN)'
+       mansubdir=cat
+       ;;
+*-*-cygwin*)
+       LIBS="$LIBS -lregex /usr/lib/textmode.o"
+       AC_DEFINE(HAVE_CYGWIN)
+       AC_DEFINE(DISABLE_PAM)
+       AC_DEFINE(DISABLE_SHADOW)
+       AC_DEFINE(IPV4_DEFAULT)
+       AC_DEFINE(IP_TOS_IS_BROKEN)
+       AC_DEFINE(BROKEN_VHANGUP)
+       no_pam=1
+       no_libsocket=1
+       no_libnsl=1
        ;;
 *-*-hpux10*)
        if test -z "$GCC"; then
                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
+       CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
+       IPADDR_IN_DISPLAY=yes
+       AC_DEFINE(USE_PIPES)
+       AC_DEFINE(DISABLE_SHADOW)
+       AC_DEFINE(DISABLE_UTMP)
+       AC_DEFINE(SPT_TYPE,SPT_PSTAT)
+       LIBS="$LIBS -lsec"
        MANTYPE='$(CATMAN)'
        mansubdir=cat
        ;;
 *-*-hpux11*)
-       if test -z "$GCC"; then
-               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
+       CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
+       IPADDR_IN_DISPLAY=yes
+       AC_DEFINE(PAM_SUN_CODEBASE)
+       AC_DEFINE(USE_PIPES)
+       AC_DEFINE(DISABLE_SHADOW)
+       AC_DEFINE(DISABLE_UTMP)
+       AC_DEFINE(SPT_TYPE,SPT_PSTAT)
+       LIBS="$LIBS -lsec"
        MANTYPE='$(CATMAN)'
        mansubdir=cat
        ;;
 *-*-irix5*)
-       CFLAGS="$CFLAGS -I/usr/local/include"
+       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS"
+       PATH="$PATH:/usr/etc"
        MANTYPE='$(CATMAN)'
        no_libsocket=1
        no_libnsl=1
+       AC_DEFINE(BROKEN_INET_NTOA)
        ;;
 *-*-irix6*)
-       CFLAGS="$CFLAGS -I/usr/local/include"
+       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS"
+       PATH="$PATH:/usr/etc"
        MANTYPE='$(CATMAN)'
        AC_DEFINE(WITH_IRIX_ARRAY)
        AC_DEFINE(WITH_IRIX_PROJECT)
        AC_DEFINE(WITH_IRIX_AUDIT)
+       AC_CHECK_FUNC(jlimit_startjob, [AC_DEFINE(WITH_IRIX_JOBS)])
        no_libsocket=1
        no_libnsl=1
+       AC_DEFINE(BROKEN_INET_NTOA)
+       mansubdir=man
        ;;
 *-*-linux*)
        no_dev_ptmx=1
        AC_DEFINE(DONT_TRY_OTHER_AF)
+       AC_DEFINE(PAM_TTY_KLUDGE)
        inet6_default_4in6=yes
        ;;
+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 ***])
+        )
+       ;;
 *-*-netbsd*)
        need_dash_r=1
        ;;
 *-next-*)
-       # hardwire lastlog location (can't detect it on some versions)
        conf_lastlog_location="/usr/adm/lastlog"
-       AC_DEFINE(HAVE_NEXT)
-       CFLAGS="$CFLAGS -I/usr/local/include"
-       MAIL=/usr/spool/mail
        conf_utmp_location=/etc/utmp
-       AC_MSG_WARN([*** Tested: PA-RISC/m68k  Untested: Sparc/Intel])
-       AC_MSG_WARN([*** Expect 'scp' to fail!])
-       AC_MSG_WARN([*** Please report any problems, thanks])
+       conf_wtmp_location=/usr/adm/wtmp
+       MAIL=/usr/spool/mail
+       AC_DEFINE(HAVE_NEXT)
+       AC_DEFINE(BROKEN_REALPATH)
+       AC_DEFINE(USE_PIPES)
+       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+       CFLAGS="$CFLAGS"
        ;;
 *-*-solaris*)
-       CFLAGS="$CFLAGS -I/usr/local/include"
+       CPPFLAGS="$CPPFLAGS -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(PAM_SUN_CODEBASE)
        # 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)
@@ -132,23 +165,73 @@ case "$host" in
        fi
        ;;
 *-*-sunos4*)
-       CFLAGS="$CFLAGS -DSUNOS4"
+       CPPFLAGS="$CPPFLAGS -DSUNOS4"
        AC_CHECK_FUNCS(getpwanam)
+       AC_DEFINE(PAM_SUN_CODEBASE)
+       conf_utmp_location=/etc/utmp
+       conf_wtmp_location=/var/adm/wtmp
+       conf_lastlog_location=/var/adm/lastlog
+       AC_DEFINE(USE_PIPES)
+       MANTYPE='$(CATMAN)'
+       mansubdir=cat
+       ;;
+*-sni-sysv*)
+       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+       LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/ucblib"
+       MANTYPE='$(CATMAN)'
+       IPADDR_IN_DISPLAY=yes
+       AC_DEFINE(USE_PIPES)
+       AC_DEFINE(IP_TOS_IS_BROKEN)
+       mansubdir=cat
+       LIBS="$LIBS -lgen -lnsl -lucb"
+       ;;
+*-*-sysv4.2*)
+       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+       LDFLAGS="$LDFLAGS -L/usr/local/lib"
+       MANTYPE='$(CATMAN)'
+       mansubdir=cat
+       enable_suid_ssh=no
+       ;;
+*-*-sysv5*)
+       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+       LDFLAGS="$LDFLAGS -L/usr/local/lib"
+       MANTYPE='$(CATMAN)'
+       mansubdir=cat
+       enable_suid_ssh=no
        ;;
 *-*-sysv*)
-       CFLAGS="$CFLAGS -I/usr/local/include"
+       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        MANTYPE='$(CATMAN)'
        mansubdir=cat
        LIBS="$LIBS -lgen -lsocket"
        ;;
-*-*-sco3*)
-       CFLAGS="$CFLAGS -I/usr/local/include"
+*-*-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"
+       LIBS="$LIBS -lgen -lsocket -los -lprot -lx -ltinfo -lm"
        no_dev_ptmx=1
+       RANLIB=true
+       AC_DEFINE(BROKEN_SYS_TERMIO_H)
+       rsh_path="/usr/bin/rcmd"
+       AC_DEFINE(HAVE_SCO_PROTECTED_PW)
+       AC_DEFINE(DISABLE_SHADOW)
+       AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
+       ;;
+*-*-sco3.2v5*)
+       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+       LDFLAGS="$LDFLAGS -L/usr/local/lib"
+       MANTYPE='$(CATMAN)'
+       mansubdir=cat
+       LIBS="$LIBS -lprot -lx -ltinfo -lm"
+       no_dev_ptmx=1
+       rsh_path="/usr/bin/rcmd"
+       AC_DEFINE(HAVE_SCO_PROTECTED_PW)
+       AC_DEFINE(DISABLE_SHADOW)
+       AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
        ;;
 *-dec-osf*)
 # This is untested
@@ -175,8 +258,16 @@ AC_ARG_WITH(cflags,
                fi
        ]       
 )
+AC_ARG_WITH(cppflags,
+       [  --with-cppflags         Specify additional flags to pass to preprocessor] ,
+       [
+               if test "x$withval" != "xno"; then
+                       CPPFLAGS="$CPPFLAGS $withval"
+               fi
+       ]
+)
 AC_ARG_WITH(ldflags,
-       [  --with-ldlags           Specify additional flags to pass to linker],
+       [  --with-ldflags          Specify additional flags to pass to linker],
        [
                if test "x$withval" != "xno" ; then
                        LDFLAGS="$LDFLAGS $withval"
@@ -194,9 +285,6 @@ AC_ARG_WITH(libs,
 
 
 # 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")
-
 if test -z "$no_libsocket" ; then
        AC_CHECK_LIB(nsl, yp_match, , )
 fi
@@ -204,22 +292,48 @@ if test -z "$no_libnsl" ; then
        AC_CHECK_LIB(socket, main, , )
 fi
 
+AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen")
+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")
+
+AC_CHECK_FUNC(regcomp, 
+       [],
+       [
+               AC_CHECK_LIB(pcre, pcre_info, 
+                       AC_DEFINE(HAVE_LIBPCRE) LIBS="$LIBS -lpcreposix -lpcre")
+       ]
+)
+
+dnl UnixWare 2.x
+AC_CHECK_FUNC(strcasecmp, 
+       [], [ AC_CHECK_LIB(resolv, strcasecmp, LIBS="$LIBS -lresolv") ]
+)
+AC_CHECK_FUNC(utimes, 
+       [], [ AC_CHECK_LIB(c89, utimes, LIBS="$LIBS -lc89") ]
+)
+
 # Checks for header files.
-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/stat.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 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 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)
 
-# 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)
-dnl    checks for time functions
+dnl    Checks for library functions.
+AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock 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 strsep strtok_r sysconf utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop)
+dnl    Checks for time functions
 AC_CHECK_FUNCS(gettimeofday time)
-dnl    checks for libutil functions
+dnl    Checks for libutil functions
+AC_CHECK_HEADERS(libutil.h)
 AC_CHECK_FUNCS(login logout updwtmp logwtmp)
-dnl    checks for utmp functions
-AC_CHECK_FUNCS(entutent getutent getutid getutline pututline setutent)
+dnl    Checks for utmp functions
+AC_CHECK_FUNCS(endutent getutent getutid getutline pututline setutent)
 AC_CHECK_FUNCS(utmpname)
-dnl    checks for utmpx functions
-AC_CHECK_FUNCS(entutxent getutxent getutxid getutxline pututxline )
+dnl    Checks for utmpx functions
+AC_CHECK_FUNCS(endutxent getutxent getutxid getutxline pututxline )
 AC_CHECK_FUNCS(setutxent utmpxname)
 
+AC_CHECK_FUNC(getuserattr, 
+       [AC_DEFINE(HAVE_GETUSERATTR)],
+       [AC_CHECK_LIB(s, getuserattr, [LIBS="$LIBS -ls"; AC_DEFINE(HAVE_GETUSERATTR)])]
+)
+
 AC_CHECK_FUNC(login, 
        [AC_DEFINE(HAVE_LOGIN)],
        [AC_CHECK_LIB(bsd, login, [LIBS="$LIBS -lbsd"; AC_DEFINE(HAVE_LOGIN)])]
@@ -252,6 +366,8 @@ int main(void){char b[5];snprintf(b,5,"123456789");return(b[4]!='\0');}
        )
 fi
 
+AC_FUNC_GETPGRP
+
 PAM_MSG="no"
 AC_ARG_WITH(pam,
        [  --without-pam           Disable PAM support ],
@@ -294,7 +410,7 @@ fi
 AC_ARG_WITH(ssl-dir,
        [  --with-ssl-dir=PATH     Specify path to OpenSSL installation ],
        [
-               if test "x$withval" != "$xno" ; then
+               if test "x$withval" != "xno" ; then
                        tryssldir=$withval
                fi
        ]
@@ -302,16 +418,16 @@ AC_ARG_WITH(ssl-dir,
 
 saved_LIBS="$LIBS"
 saved_LDFLAGS="$LDFLAGS"
-saved_CFLAGS="$CFLAGS"
+saved_CPPFLAGS="$CPPFLAGS"
 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
+       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"
+                       CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
                        if test ! -z "$need_dash_r" ; then
                                LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
                        fi
@@ -360,7 +476,7 @@ 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
-       CFLAGS="$saved_CFLAGS -I$ssldir/include"
+       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"
@@ -421,6 +537,11 @@ else
        fi
 fi
 
+# Cheap hack to ensure NEWS-OS libraries are arranged right.
+if test ! -z "$SONY" ; then
+  LIBS="$LIBS -liberty";
+fi
+
 # Checks for data types
 AC_CHECK_SIZEOF(char, 1)
 AC_CHECK_SIZEOF(short int, 2)
@@ -429,6 +550,19 @@ AC_CHECK_SIZEOF(long int, 4)
 AC_CHECK_SIZEOF(long long int, 8)
 
 # More checks for data types
+AC_CACHE_CHECK([for u_int type], ac_cv_have_u_int, [
+       AC_TRY_COMPILE(
+               [ #include <sys/types.h> ], 
+               [ u_int a; a = 1;], 
+               [ ac_cv_have_u_int="yes" ],
+               [ ac_cv_have_u_int="no" ]
+       )
+])
+if test "x$ac_cv_have_u_int" = "xyes" ; then
+       AC_DEFINE(HAVE_U_INT)
+       have_u_int=1
+fi
+
 AC_CACHE_CHECK([for intXX_t types], ac_cv_have_intxx_t, [
        AC_TRY_COMPILE(
                [ #include <sys/types.h> ], 
@@ -442,6 +576,19 @@ if test "x$ac_cv_have_intxx_t" = "xyes" ; then
        have_intxx_t=1
 fi
        
+AC_CACHE_CHECK([for int64_t type], ac_cv_have_int64_t, [
+       AC_TRY_COMPILE(
+               [ #include <sys/types.h> ], 
+               [ int64_t a; a = 1;], 
+               [ ac_cv_have_int64_t="yes" ],
+               [ ac_cv_have_int64_t="no" ]
+       )
+])
+if test "x$ac_cv_have_int64_t" = "xyes" ; then
+       AC_DEFINE(HAVE_INT64_T)
+       have_int64_t=1
+fi
+       
 AC_CACHE_CHECK([for u_intXX_t types], ac_cv_have_u_intxx_t, [
        AC_TRY_COMPILE(
                [ #include <sys/types.h> ], 
@@ -455,6 +602,18 @@ if test "x$ac_cv_have_u_intxx_t" = "xyes" ; then
        have_u_intxx_t=1
 fi
 
+AC_CACHE_CHECK([for u_int64_t types], ac_cv_have_u_int64_t, [
+       AC_TRY_COMPILE(
+               [ #include <sys/types.h> ], 
+               [ u_int64_t a; a = 1;], 
+               [ ac_cv_have_u_int64_t="yes" ],
+               [ ac_cv_have_u_int64_t="no" ]
+       )
+])
+if test "x$ac_cv_have_u_int64_t" = "xyes" ; then
+       AC_DEFINE(HAVE_U_INT64_T)
+       have_u_int64_t=1
+fi
 
 if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \
            test "x$ac_cv_header_sys_bitypes_h" = "xyes")
@@ -537,6 +696,20 @@ if test "x$ac_cv_have_ssize_t" = "xyes" ; then
        AC_DEFINE(HAVE_SSIZE_T)
 fi
 
+AC_CACHE_CHECK([for clock_t], ac_cv_have_clock_t, [
+       AC_TRY_COMPILE(
+               [
+#include <time.h>
+               ],
+               [ clock_t foo; foo = 1235; ],
+               [ ac_cv_have_clock_t="yes" ],
+               [ ac_cv_have_clock_t="no" ]
+       )
+])
+if test "x$ac_cv_have_clock_t" = "xyes" ; then
+       AC_DEFINE(HAVE_CLOCK_T)
+fi
+
 AC_CACHE_CHECK([for sa_family_t], ac_cv_have_sa_family_t, [
        AC_TRY_COMPILE(
                [
@@ -545,7 +718,17 @@ AC_CACHE_CHECK([for sa_family_t], ac_cv_have_sa_family_t, [
                ],
                [ sa_family_t foo; foo = 1235; ],
                [ ac_cv_have_sa_family_t="yes" ],
+               [ AC_TRY_COMPILE(
+                 [
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+               ],
+               [ sa_family_t foo; foo = 1235; ],
+               [ ac_cv_have_sa_family_t="yes" ],
+
                [ ac_cv_have_sa_family_t="no" ]
+       )]
        )
 ])
 if test "x$ac_cv_have_sa_family_t" = "xyes" ; then
@@ -642,9 +825,29 @@ if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then
        AC_DEFINE(HAVE_STRUCT_ADDRINFO)
 fi
 
+AC_CACHE_CHECK([for struct timeval], ac_cv_have_struct_timeval, [
+       AC_TRY_COMPILE(
+               [ #include <sys/time.h> ], 
+               [ struct timeval tv; tv.tv_sec = 1;], 
+               [ ac_cv_have_struct_timeval="yes" ],
+               [ ac_cv_have_struct_timeval="no" ]
+       )
+])
+if test "x$ac_cv_have_struct_timeval" = "xyes" ; then
+       AC_DEFINE(HAVE_STRUCT_TIMEVAL)
+       have_struct_timeval=1
+fi
 
-# Checks for structure members
+# If we don't have int64_t then we can't compile sftp-server.  So don't
+# even attempt to do it. 
+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='#'
+fi
+AC_SUBST(NO_SFTP)
 
+dnl Checks for structure members
 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)
@@ -662,6 +865,23 @@ 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_STRUCT_ST_BLKSIZE
+
+AC_CACHE_CHECK([for sun_len field in struct sockaddr_un],
+               ac_cv_have_sun_len_in_struct_sockaddr_un, [
+       AC_TRY_COMPILE(
+               [
+#include <sys/types.h>
+#include <sys/socket.h>
+               ],
+               [ struct sockaddr_un s; s.sun_len = 1; ],
+               [ ac_cv_have_sun_len_in_struct_sockaddr_un="yes" ],
+               [ ac_cv_have_sun_len_in_struct_sockaddr_un="no" ],
+       )
+])
+if test "x$ac_cv_have_sun_len_in_struct_sockaddr_un" = "xyes" ; then
+       AC_DEFINE(HAVE_SUN_LEN_IN_SOCKADDR_UN)
+fi
 
 AC_CACHE_CHECK([for ss_family field in struct sockaddr_storage],
                ac_cv_have_ss_family_in_struct_ss, [
@@ -695,6 +915,21 @@ 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 pw_class field in struct passwd],
+               ac_cv_have_pw_class_in_struct_passwd, [
+       AC_TRY_COMPILE(
+               [
+#include <pwd.h>
+               ],
+               [ struct passwd p; p.pw_class = 0; ],
+               [ ac_cv_have_pw_class_in_struct_passwd="yes" ],
+               [ ac_cv_have_pw_class_in_struct_passwd="no" ]
+       )
+])
+if test "x$ac_cv_have_pw_class_in_struct_passwd" = "xyes" ; then
+       AC_DEFINE(HAVE_PW_CLASS_IN_PASSWD)
+fi
+
 
 AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [
        AC_TRY_LINK([], 
@@ -708,6 +943,30 @@ if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
 fi
 
 
+AC_CACHE_CHECK([if libc defines sys_errlist], ac_cv_libc_defines_sys_errlist, [
+       AC_TRY_LINK([], 
+               [ extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]);], 
+               [ ac_cv_libc_defines_sys_errlist="yes" ],
+               [ ac_cv_libc_defines_sys_errlist="no" ]
+       )
+])
+if test "x$ac_cv_libc_defines_sys_errlist" = "xyes" ; then
+       AC_DEFINE(HAVE_SYS_ERRLIST)
+fi
+
+
+AC_CACHE_CHECK([if libc defines sys_nerr], ac_cv_libc_defines_sys_nerr, [
+       AC_TRY_LINK([], 
+               [ extern int sys_nerr; printf("%i", sys_nerr);], 
+               [ ac_cv_libc_defines_sys_nerr="yes" ],
+               [ ac_cv_libc_defines_sys_nerr="no" ]
+       )
+])
+if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then
+       AC_DEFINE(HAVE_SYS_NERR)
+fi
+
+
 # Looking for programs, paths and files
 AC_ARG_WITH(rsh,
        [  --with-rsh=PATH         Specify path to remote shell program ],
@@ -724,20 +983,25 @@ AC_ARG_WITH(rsh,
 AC_ARG_WITH(xauth,
        [  --with-xauth=PATH       Specify path to xauth program ],
        [
-               if test "x$withval" != "$xno" ; then
+               if test "x$withval" != "xno" ; then
                        xauth_path=$withval
                fi
        ],
        [
-               AC_PATH_PROG(xauth_path, xauth)
+               AC_PATH_PROG(xauth_path, xauth,,$PATH:/usr/X/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/openwin/bin)
                if (test ! -z "$xauth_path" && test -x "/usr/openwin/bin/xauth") ; then
                        xauth_path="/usr/openwin/bin/xauth"
                fi
        ]
 )
 
-if test ! -z "$xauth_path" ; then
+if test -z "$xauth_path" ; then
+       XAUTH_PATH="undefined"
+       AC_SUBST(XAUTH_PATH)
+else
        AC_DEFINE_UNQUOTED(XAUTH_PATH, "$xauth_path")
+       XAUTH_PATH=$xauth_path
+       AC_SUBST(XAUTH_PATH)
 fi
 if test ! -z "$rsh_path" ; then
        AC_DEFINE_UNQUOTED(RSH_PATH, "$rsh_path")
@@ -850,8 +1114,8 @@ AC_ARG_WITH(kerberos4,
        [
                if test "x$withval" != "xno" ; then
        
-                       if test "x$withval" != "$xyes" ; then
-                               CFLAGS="$CFLAGS -I${withval}/include"
+                       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"
@@ -861,7 +1125,7 @@ AC_ARG_WITH(kerberos4,
                                fi
                        else
                                if test -d /usr/include/kerberosIV ; then
-                                       CFLAGS="$CFLAGS -I/usr/include/kerberosIV"
+                                       CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV"
                                fi
                        fi
 
@@ -890,9 +1154,9 @@ AC_ARG_WITH(afs,
        [
                if test "x$withval" != "xno" ; then
 
-                       if test "x$withval" != "$xyes" ; then
-                               CFLAGS="$CFLAGS -I${withval}/include"
-                               LFLAGS="$LFLAGS -L${withval}/lib"
+                       if test "x$withval" != "xyes" ; then
+                               CPPFLAGS="$CPPFLAGS -I${withval}/include"
+                               LDFLAGS="$LDFLAGS -L${withval}/lib"
                        fi
 
                        if test -z "$KRB4" ; then
@@ -913,12 +1177,24 @@ LIBS="$LIBS $KLIBS"
 # Check whether user wants S/Key support
 SKEY_MSG="no" 
 AC_ARG_WITH(skey,
-       [  --with-skey             Enable S/Key support],
+       [  --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="$LIBS -lskey"
                        SKEY_MSG="yes" 
+       
+                       AC_CHECK_FUNC(skey_keyinfo,
+                               [],
+                               [
+                                       AC_MSG_ERROR([** Incomplete or missing s/key libraries.])
+                               ])
                fi
        ]
 )
@@ -994,16 +1270,21 @@ if test -z "$disable_shadow" ; then
 fi
 
 # Use ip address instead of hostname in $DISPLAY
-DISPLAY_HACK_MSG="no" 
-AC_ARG_WITH(ipaddr-display,
-       [  --with-ipaddr-display   Use ip address instead of hostname in \$DISPLAY],
-       [
-               if test "x$withval" = "xno" ; then      
-                       AC_DEFINE(IPADDR_IN_DISPLAY)
-                       DISPLAY_HACK_MSG="yes" 
-               fi
-       ]
-)
+if test ! -z "$IPADDR_IN_DISPLAY" ; then
+       DISPLAY_HACK_MSG="yes"
+       AC_DEFINE(IPADDR_IN_DISPLAY)
+else
+       DISPLAY_HACK_MSG="no" 
+       AC_ARG_WITH(ipaddr-display,
+               [  --with-ipaddr-display   Use ip address instead of hostname in \$DISPLAY],
+               [
+                       if test "x$withval" != "xno" ; then     
+                               AC_DEFINE(IPADDR_IN_DISPLAY)
+                               DISPLAY_HACK_MSG="yes" 
+                       fi
+               ]
+       )
+fi
 
 # Whether to mess with the default path
 SERVER_PATH_MSG="(default)" 
@@ -1052,6 +1333,25 @@ AC_ARG_WITH(4in6,
        ]
 )
 
+AC_MSG_CHECKING(whether to install ssh as suid root)
+AC_ARG_ENABLE(suid-ssh,
+[  --enable-suid-ssh       Install ssh as suid root (default)
+  --disable-suid-ssh      Install ssh without suid bit],
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       SSHMODE=0711
+       ;;
+  *)   AC_MSG_RESULT(yes)
+       SSHMODE=04711
+       ;;
+  esac ],
+  AC_MSG_RESULT(yes)
+  SSHMODE=04711
+)
+AC_SUBST(SSHMODE)
+
+
 # Where to place sshd.pid
 piddir=/var/run
 AC_ARG_WITH(pid-dir,
@@ -1063,6 +1363,14 @@ AC_ARG_WITH(pid-dir,
        ]
 )
 
+# make sure the directory exists
+if test ! -d $piddir ; then    
+       piddir=`eval echo ${sysconfdir}`
+       case $piddir in
+               NONE/*) piddir=`echo $piddir | sed "s~NONE~$ac_default_prefix~"` ;;
+       esac
+fi
+
 AC_DEFINE_UNQUOTED(PIDDIR, "$piddir")
 AC_SUBST(piddir)
 
@@ -1295,6 +1603,8 @@ if test ! -z "$blibpath" ; then
        AC_MSG_WARN([Please check and edit -blibpath in LDFLAGS in Makefile])
 fi
 
+AC_EXEEXT
+
 AC_OUTPUT(Makefile ssh_prng_cmds)
 
 # Print summary of options
@@ -1311,6 +1621,7 @@ else
                RAND_MSG="EGD ($EGD_SOCKET)"
        else
                RAND_MSG="Builtin (timeout $entropy_timeout)"
+               BUILTIN_RNG=1
        fi
 fi
 
@@ -1319,13 +1630,14 @@ A=`eval echo ${prefix}` ; A=`eval echo ${A}`
 B=`eval echo ${bindir}` ; B=`eval echo ${B}`
 C=`eval echo ${sbindir}` ; C=`eval echo ${C}`
 D=`eval echo ${sysconfdir}` ; D=`eval echo ${D}`
-E=`eval echo ${libexecdir}/ssh/ssh-askpass` ; E=`eval echo ${E}`
+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}`
 
 echo ""
 echo "OpenSSH configured has been configured with the following options."
 echo "                 User binaries: $B"
+echo "                 User binaries: $B"
 echo "               System binaries: $C"
 echo "           Configuration files: $D"
 echo "               Askpass program: $E"
@@ -1345,9 +1657,31 @@ echo "       Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
 
 echo ""
 
-echo "Compiler flags: ${CFLAGS}"
-echo "Linker flags: ${LDFLAGS}"
-echo "Libraries: ${LIBS}"
+echo "              Host: ${host}"
+echo "          Compiler: ${CC}"
+echo "    Compiler flags: ${CFLAGS}"
+echo "Preprocessor flags: ${CPPFLAGS}"
+echo "      Linker flags: ${LDFLAGS}"
+echo "         Libraries: ${LIBS}"
 
 echo ""
 
+if test "x$PAM_MSG" = "xyes" ; then
+       echo "PAM is enabled. You may need to install a PAM control file for sshd,"
+       echo "otherwise password authentication may fail. Example PAM control files"
+       echo "can be found in the contrib/ subdirectory"
+       echo ""
+fi
+
+if test ! -z "$BUILTIN_RNG" ; then
+       echo "WARNING: you are using the builtin random number collection service."
+       echo "Please read WARNING.RNG and request that your OS vendor includes"
+       echo "/dev/random in future versions of their OS."
+       echo ""
+fi
+
+if test ! -z "$NO_SFTP"; then
+       echo "sftp-server will be disabled.  Your compiler does not support"
+       echo "64bit integers."
+       echo ""
+fi
This page took 0.070676 seconds and 4 git commands to generate.