- (tim) [configure.ac auth.c defines.h session.c openbsd-compat/port-uw.c

[openssh.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 066a5097c875ebe31ce5eaa285102f8d47810e31..df0868f52f5f2459b04c8c27894342718bfc1377 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -82,7 +82,13 @@ AC_CHECK_DECL(LLONG_MAX, have_llong_max=1, , [#include <limits.h>])
 
 if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
        CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wuninitialized"
-       CFLAGS="$CFLAGS -Wsign-compare"
+       GCC_VER=`$CC --version`
+       case $GCC_VER in
+               1.*) ;;
+               2.8* | 2.9*) CFLAGS="$CFLAGS -Wsign-compare" ;;
+               2.*) ;;
+               *) CFLAGS="$CFLAGS -Wsign-compare" ;;
+       esac
 
        if test -z "$have_llong_max"; then
                # retry LLONG_MAX with -std=gnu99, needed on some Linuxes
@@ -440,6 +446,8 @@ mips-sony-bsd|mips-sony-newsos4)
        ;;
 # UnixWare 7.x, OpenUNIX 8
 *-*-sysv5*)
+       check_for_libcrypt_later=1
+       AC_DEFINE(UNIXWARE_LONG_PASSWORDS, 1, [Support passwords > 8 chars])
        AC_DEFINE(USE_PIPES)
        AC_DEFINE(SETEUID_BREAKS_SETUID)
        AC_DEFINE(BROKEN_SETREUID)
@@ -448,6 +456,7 @@ mips-sony-bsd|mips-sony-newsos4)
        case "$host" in
        *-*-sysv5SCO_SV*)       # SCO OpenServer 6.x
                TEST_SHELL=/u95/bin/sh
+               AC_DEFINE(BROKEN_LIBIAF, 1, [ia_uinfo routines not supported by OS yet])
                ;;
        esac
        ;;
@@ -555,6 +564,12 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(NEED_SETPRGP, [], [Need setpgrp to acquire controlling tty])
        AC_DEFINE(HAVE_SYS_SYSLOG_H, 1, [Force use of sys/syslog.h on Ultrix])
        ;;
+
+*-*-lynxos)
+        CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
+        AC_DEFINE(MISSING_HOWMANY)
+        AC_DEFINE(BROKEN_SETVBUF, 1, [LynxOS has broken setvbuf() implementation])
+        ;;
 esac
 
 # Allow user to specify flags
@@ -631,6 +646,7 @@ AC_CHECK_HEADERS( \
        getopt.h \
        glob.h \
        ia.h \
+       iaf.h \
        lastlog.h \
        limits.h \
        login.h \
@@ -1023,6 +1039,21 @@ AC_ARG_WITH(libedit,
                        [ AC_MSG_ERROR(libedit not found) ],
                        [ -lcurses ]
                )
+               AC_MSG_CHECKING(if libedit version is compatible)
+               AC_COMPILE_IFELSE(
+                   [AC_LANG_SOURCE([[
+#include <histedit.h>
+int main(void)
+{
+       int i = H_SETSIZE;
+       el_init("", NULL, NULL, NULL);
+       exit(0);
+}
+                   ]])],
+                   [ AC_MSG_RESULT(yes) ],
+                   [ AC_MSG_RESULT(no)
+                     AC_MSG_ERROR(libedit version is not compatible) ]
+               )
        fi ]
 )
 
@@ -1052,6 +1083,7 @@ AC_ARG_WITH(audit,
                AC_DEFINE(SSH_AUDIT_EVENTS, [], Use audit debugging module)
                ;;
          no)
+               AC_MSG_RESULT(no)
                ;;
          *)
                AC_MSG_ERROR([Unknown audit module $withval])
@@ -1071,7 +1103,6 @@ AC_CHECK_FUNCS( \
        clock \
        closefrom \
        dirfd \
-       fchdir \
        fchmod \
        fchown \
        freeaddrinfo \
@@ -1694,6 +1725,7 @@ if test "x$check_for_libcrypt_later" = "x1"; then
        AC_CHECK_LIB(crypt, crypt, LIBS="$LIBS -lcrypt")
 fi
 
+AC_CHECK_LIB(iaf, ia_openinfo)
 
 ### Configure cryptographic random number support