1 files changed, 32 insertions, 9 deletions

diff --git a/configure.in b/configure.in
index 262b62a69..dd68daeb1 100644
--- a/configure.in
+++ b/configure.in
@@ -188,7 +188,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 +195,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 +217,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 +283,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,12 +302,13 @@ 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)
@@ -801,6 +809,15 @@ if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then
         AC_DEFINE(HAVE_STRUCT_ADDRINFO)
 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='#'
+        AC_SUBST(NO_SFTP)
+fi
+
 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 +1650,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