- djm@cvs.openbsd.org 2010/01/28 00:21:18

[openssh.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a0c50e30021637023cbb124f260a4f6aa17d57d1..5c84984adef6c0732222f92d057e944a7d4a84fb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -446,7 +446,7 @@ int main(void) { exit(0); }
        AC_DEFINE(DISABLE_FD_PASSING, 1,
                [Define if your platform needs to skip post auth
                file descriptor passing])
-       AC_DEFINE(SSH_IOBUFSZ, 65536, [Windows is sensitive to read buffer size])
+       AC_DEFINE(SSH_IOBUFSZ, 65535, [Windows is sensitive to read buffer size])
        ;;
 *-*-dgux*)
        AC_DEFINE(IP_TOS_IS_BROKEN, 1,
@@ -589,6 +589,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
                if it doesn't return EOPNOTSUPP.])
        AC_DEFINE(_PATH_BTMP, "/var/log/btmp", [log for bad login attempts])
        AC_DEFINE(USE_BTMP)
+       AC_DEFINE(LINUX_OOM_ADJUST, 1, [Adjust Linux out-of-memory killer])
        inet6_default_4in6=yes
        case `uname -r` in
        1.*|2.0.*)
@@ -743,9 +744,11 @@ mips-sony-bsd|mips-sony-newsos4)
        ;;
 # UnixWare 7.x, OpenUNIX 8
 *-*-sysv5*)
+       CPPFLAGS="$CPPFLAGS -Dvsnprintf=_xvsnprintf -Dsnprintf=_xsnprintf"
        AC_DEFINE(UNIXWARE_LONG_PASSWORDS, 1, [Support passwords > 8 chars])
        AC_DEFINE(USE_PIPES)
        AC_DEFINE(SETEUID_BREAKS_SETUID)
+       AC_DEFINE(BROKEN_GETADDRINFO)
        AC_DEFINE(BROKEN_SETREUID)
        AC_DEFINE(BROKEN_SETREGID)
        AC_DEFINE(PASSWD_NEEDS_USERNAME)
@@ -784,6 +787,7 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(DISABLE_SHADOW)
        AC_DEFINE(DISABLE_FD_PASSING)
        AC_DEFINE(SETEUID_BREAKS_SETUID)
+       AC_DEFINE(BROKEN_GETADDRINFO)
        AC_DEFINE(BROKEN_SETREUID)
        AC_DEFINE(BROKEN_SETREGID)
        AC_DEFINE(WITH_ABBREV_NO_TTY)
@@ -1350,6 +1354,7 @@ AC_CHECK_FUNCS( \
        getrlimit \
        getttyent \
        glob \
+       group_from_gid \
        inet_aton \
        inet_ntoa \
        inet_ntop \
@@ -1376,8 +1381,10 @@ AC_CHECK_FUNCS( \
        setegid \
        setenv \
        seteuid \
+       setgroupent \
        setgroups \
        setlogin \
+       setpassent\
        setpcred \
        setproctitle \
        setregid \
@@ -1406,6 +1413,7 @@ AC_CHECK_FUNCS( \
        truncate \
        unsetenv \
        updwtmpx \
+       user_from_uid \
        vasprintf \
        vhangup \
        vsnprintf \
@@ -3295,11 +3303,18 @@ AC_ARG_WITH(opensc,
        [  --with-opensc[[=PFX]]     Enable smartcard support using OpenSC (optionally in PATH)],
        [
            if test "x$withval" != "xno" ; then
-               if test "x$withval" != "xyes" ; then
-                       OPENSC_CONFIG=$withval/bin/opensc-config
+               AC_PATH_PROG(PKGCONFIG, pkg-config, no)
+               AC_MSG_CHECKING(how to get opensc config)
+               if test "x$withval" != "xyes" -a "x$PKGCONFIG" = "xno"; then
+                       OPENSC_CONFIG="$withval/bin/opensc-config"
+               elif test -f "$withval/src/libopensc/libopensc.pc"; then
+                       OPENSC_CONFIG="$PKGCONFIG $withval/src/libopensc/libopensc.pc"
+               elif test "x$PKGCONFIG" != "xno"; then
+                       OPENSC_CONFIG="$PKGCONFIG libopensc"
                else
-                       AC_PATH_PROG(OPENSC_CONFIG, opensc-config, no)
+                       AC_PATH_PROG(OPENSC_CONFIG, opensc-config, no)
                fi
+               AC_MSG_RESULT($OPENSC_CONFIG)
                if test "$OPENSC_CONFIG" != "no"; then
                        LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags`
                        LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs`