- (bal) utimes() support via utime() interface on machine that lack utimes().

[openssh.git] / configure.in

diff --git a/configure.in b/configure.in
index 262b62a69a2ee9274a5e6013b95e70d54c0f296f..82cb5d4bd12f96f0014becaa42d33ae90c647183 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -179,6 +179,8 @@ mips-sony-bsd|mips-sony-newsos4)
        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"
@@ -188,7 +190,6 @@ mips-sony-bsd|mips-sony-newsos4)
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        MANTYPE='$(CATMAN)'
        mansubdir=cat
-       LIBS="$LIBS -lgen -lsocket -lnsl -lresolv"
        enable_suid_ssh=no
        ;;
 *-*-sysv5*)
@@ -196,7 +197,6 @@ mips-sony-bsd|mips-sony-newsos4)
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        MANTYPE='$(CATMAN)'
        mansubdir=cat
-       LIBS="$LIBS -lgen -lsocket"
        enable_suid_ssh=no
        ;;
 *-*-sysv*)
@@ -219,13 +219,14 @@ mips-sony-bsd|mips-sony-newsos4)
        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 -lgen -lsocket -lprot -lx -ltinfo -lm"
+       LIBS="$LIBS -lprot -lx -ltinfo -lm"
        no_dev_ptmx=1
        rsh_path="/usr/bin/rcmd"
        AC_DEFINE(HAVE_SCO_PROTECTED_PW)
@@ -284,6 +285,14 @@ AC_ARG_WITH(libs,
 
 
 # Checks for libraries.
+if test -z "$no_libsocket" ; then
+       AC_CHECK_LIB(nsl, yp_match, , )
+fi
+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")
 
@@ -295,18 +304,19 @@ AC_CHECK_FUNC(regcomp,
        ]
 )
 
-if test -z "$no_libsocket" ; then
-       AC_CHECK_LIB(nsl, yp_match, , )
-fi
-if test -z "$no_libnsl" ; then
-       AC_CHECK_LIB(socket, main, , )
-fi
+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 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 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 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)
 
 dnl    Checks for library functions.
-AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo 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 vsnprintf vhangup vis waitpid _getpty __b64_ntop)
+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
@@ -686,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(
                [
@@ -801,6 +825,28 @@ 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
+
+# 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)
@@ -1633,3 +1679,9 @@ if test ! -z "$BUILTIN_RNG" ; then
        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