diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 92 |
1 files changed, 24 insertions, 68 deletions
diff --git a/configure.ac b/configure.ac index 2f1dfbaff..dfd63765b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.427 2009/09/11 04:56:08 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.444 2010/03/05 04:04:35 djm Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.427 $) | 18 | AC_REVISION($Revision: 1.444 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -108,7 +108,7 @@ if test "$GCC" = "yes" || test "$GCC" = "egcs"; then | |||
108 | ;; | 108 | ;; |
109 | 2.*) no_attrib_nonnull=1 ;; | 109 | 2.*) no_attrib_nonnull=1 ;; |
110 | 3.*) CFLAGS="$CFLAGS -Wsign-compare -Wformat-security" ;; | 110 | 3.*) CFLAGS="$CFLAGS -Wsign-compare -Wformat-security" ;; |
111 | 4.*) CFLAGS="$CFLAGS -Wsign-compare -Wno-pointer-sign -Wformat-security" ;; | 111 | 4.*) CFLAGS="$CFLAGS -Wsign-compare -Wno-pointer-sign -Wformat-security -fno-strict-aliasing" ;; |
112 | *) ;; | 112 | *) ;; |
113 | esac | 113 | esac |
114 | 114 | ||
@@ -446,7 +446,7 @@ int main(void) { exit(0); } | |||
446 | AC_DEFINE(DISABLE_FD_PASSING, 1, | 446 | AC_DEFINE(DISABLE_FD_PASSING, 1, |
447 | [Define if your platform needs to skip post auth | 447 | [Define if your platform needs to skip post auth |
448 | file descriptor passing]) | 448 | file descriptor passing]) |
449 | AC_DEFINE(SSH_IOBUFSZ, 65536, [Windows is sensitive to read buffer size]) | 449 | AC_DEFINE(SSH_IOBUFSZ, 65535, [Windows is sensitive to read buffer size]) |
450 | ;; | 450 | ;; |
451 | *-*-dgux*) | 451 | *-*-dgux*) |
452 | AC_DEFINE(IP_TOS_IS_BROKEN, 1, | 452 | AC_DEFINE(IP_TOS_IS_BROKEN, 1, |
@@ -613,6 +613,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | |||
613 | if it doesn't return EOPNOTSUPP.]) | 613 | if it doesn't return EOPNOTSUPP.]) |
614 | AC_DEFINE(_PATH_BTMP, "/var/log/btmp", [log for bad login attempts]) | 614 | AC_DEFINE(_PATH_BTMP, "/var/log/btmp", [log for bad login attempts]) |
615 | AC_DEFINE(USE_BTMP) | 615 | AC_DEFINE(USE_BTMP) |
616 | AC_DEFINE(LINUX_OOM_ADJUST, 1, [Adjust Linux out-of-memory killer]) | ||
616 | inet6_default_4in6=yes | 617 | inet6_default_4in6=yes |
617 | case `uname -r` in | 618 | case `uname -r` in |
618 | 1.*|2.0.*) | 619 | 1.*|2.0.*) |
@@ -767,9 +768,11 @@ mips-sony-bsd|mips-sony-newsos4) | |||
767 | ;; | 768 | ;; |
768 | # UnixWare 7.x, OpenUNIX 8 | 769 | # UnixWare 7.x, OpenUNIX 8 |
769 | *-*-sysv5*) | 770 | *-*-sysv5*) |
771 | CPPFLAGS="$CPPFLAGS -Dvsnprintf=_xvsnprintf -Dsnprintf=_xsnprintf" | ||
770 | AC_DEFINE(UNIXWARE_LONG_PASSWORDS, 1, [Support passwords > 8 chars]) | 772 | AC_DEFINE(UNIXWARE_LONG_PASSWORDS, 1, [Support passwords > 8 chars]) |
771 | AC_DEFINE(USE_PIPES) | 773 | AC_DEFINE(USE_PIPES) |
772 | AC_DEFINE(SETEUID_BREAKS_SETUID) | 774 | AC_DEFINE(SETEUID_BREAKS_SETUID) |
775 | AC_DEFINE(BROKEN_GETADDRINFO) | ||
773 | AC_DEFINE(BROKEN_SETREUID) | 776 | AC_DEFINE(BROKEN_SETREUID) |
774 | AC_DEFINE(BROKEN_SETREGID) | 777 | AC_DEFINE(BROKEN_SETREGID) |
775 | AC_DEFINE(PASSWD_NEEDS_USERNAME) | 778 | AC_DEFINE(PASSWD_NEEDS_USERNAME) |
@@ -808,6 +811,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
808 | AC_DEFINE(DISABLE_SHADOW) | 811 | AC_DEFINE(DISABLE_SHADOW) |
809 | AC_DEFINE(DISABLE_FD_PASSING) | 812 | AC_DEFINE(DISABLE_FD_PASSING) |
810 | AC_DEFINE(SETEUID_BREAKS_SETUID) | 813 | AC_DEFINE(SETEUID_BREAKS_SETUID) |
814 | AC_DEFINE(BROKEN_GETADDRINFO) | ||
811 | AC_DEFINE(BROKEN_SETREUID) | 815 | AC_DEFINE(BROKEN_SETREUID) |
812 | AC_DEFINE(BROKEN_SETREGID) | 816 | AC_DEFINE(BROKEN_SETREGID) |
813 | AC_DEFINE(WITH_ABBREV_NO_TTY) | 817 | AC_DEFINE(WITH_ABBREV_NO_TTY) |
@@ -1374,6 +1378,7 @@ AC_CHECK_FUNCS( \ | |||
1374 | getrlimit \ | 1378 | getrlimit \ |
1375 | getttyent \ | 1379 | getttyent \ |
1376 | glob \ | 1380 | glob \ |
1381 | group_from_gid \ | ||
1377 | inet_aton \ | 1382 | inet_aton \ |
1378 | inet_ntoa \ | 1383 | inet_ntoa \ |
1379 | inet_ntop \ | 1384 | inet_ntop \ |
@@ -1400,8 +1405,10 @@ AC_CHECK_FUNCS( \ | |||
1400 | setegid \ | 1405 | setegid \ |
1401 | setenv \ | 1406 | setenv \ |
1402 | seteuid \ | 1407 | seteuid \ |
1408 | setgroupent \ | ||
1403 | setgroups \ | 1409 | setgroups \ |
1404 | setlogin \ | 1410 | setlogin \ |
1411 | setpassent\ | ||
1405 | setpcred \ | 1412 | setpcred \ |
1406 | setproctitle \ | 1413 | setproctitle \ |
1407 | setregid \ | 1414 | setregid \ |
@@ -1430,12 +1437,18 @@ AC_CHECK_FUNCS( \ | |||
1430 | truncate \ | 1437 | truncate \ |
1431 | unsetenv \ | 1438 | unsetenv \ |
1432 | updwtmpx \ | 1439 | updwtmpx \ |
1440 | user_from_uid \ | ||
1433 | vasprintf \ | 1441 | vasprintf \ |
1434 | vhangup \ | 1442 | vhangup \ |
1435 | vsnprintf \ | 1443 | vsnprintf \ |
1436 | waitpid \ | 1444 | waitpid \ |
1437 | ) | 1445 | ) |
1438 | 1446 | ||
1447 | # PKCS#11 support requires dlopen() and co | ||
1448 | AC_SEARCH_LIBS(dlopen, dl, | ||
1449 | AC_DEFINE([ENABLE_PKCS11], [], [Enable for PKCS#11 support]) | ||
1450 | ) | ||
1451 | |||
1439 | # IRIX has a const char return value for gai_strerror() | 1452 | # IRIX has a const char return value for gai_strerror() |
1440 | AC_CHECK_FUNCS(gai_strerror,[ | 1453 | AC_CHECK_FUNCS(gai_strerror,[ |
1441 | AC_DEFINE(HAVE_GAI_STRERROR) | 1454 | AC_DEFINE(HAVE_GAI_STRERROR) |
@@ -3279,66 +3292,6 @@ if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then | |||
3279 | AC_DEFINE(HAVE_SYS_NERR, 1, [Define if your system defines sys_nerr]) | 3292 | AC_DEFINE(HAVE_SYS_NERR, 1, [Define if your system defines sys_nerr]) |
3280 | fi | 3293 | fi |
3281 | 3294 | ||
3282 | SCARD_MSG="no" | ||
3283 | # Check whether user wants sectok support | ||
3284 | AC_ARG_WITH(sectok, | ||
3285 | [ --with-sectok Enable smartcard support using libsectok], | ||
3286 | [ | ||
3287 | if test "x$withval" != "xno" ; then | ||
3288 | if test "x$withval" != "xyes" ; then | ||
3289 | CPPFLAGS="$CPPFLAGS -I${withval}" | ||
3290 | LDFLAGS="$LDFLAGS -L${withval}" | ||
3291 | if test ! -z "$need_dash_r" ; then | ||
3292 | LDFLAGS="$LDFLAGS -R${withval}" | ||
3293 | fi | ||
3294 | if test ! -z "$blibpath" ; then | ||
3295 | blibpath="$blibpath:${withval}" | ||
3296 | fi | ||
3297 | fi | ||
3298 | AC_CHECK_HEADERS(sectok.h) | ||
3299 | if test "$ac_cv_header_sectok_h" != yes; then | ||
3300 | AC_MSG_ERROR(Can't find sectok.h) | ||
3301 | fi | ||
3302 | AC_CHECK_LIB(sectok, sectok_open) | ||
3303 | if test "$ac_cv_lib_sectok_sectok_open" != yes; then | ||
3304 | AC_MSG_ERROR(Can't find libsectok) | ||
3305 | fi | ||
3306 | AC_DEFINE(SMARTCARD, 1, | ||
3307 | [Define if you want smartcard support]) | ||
3308 | AC_DEFINE(USE_SECTOK, 1, | ||
3309 | [Define if you want smartcard support | ||
3310 | using sectok]) | ||
3311 | SCARD_MSG="yes, using sectok" | ||
3312 | fi | ||
3313 | ] | ||
3314 | ) | ||
3315 | |||
3316 | # Check whether user wants OpenSC support | ||
3317 | OPENSC_CONFIG="no" | ||
3318 | AC_ARG_WITH(opensc, | ||
3319 | [ --with-opensc[[=PFX]] Enable smartcard support using OpenSC (optionally in PATH)], | ||
3320 | [ | ||
3321 | if test "x$withval" != "xno" ; then | ||
3322 | if test "x$withval" != "xyes" ; then | ||
3323 | OPENSC_CONFIG=$withval/bin/opensc-config | ||
3324 | else | ||
3325 | AC_PATH_PROG(OPENSC_CONFIG, opensc-config, no) | ||
3326 | fi | ||
3327 | if test "$OPENSC_CONFIG" != "no"; then | ||
3328 | LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags` | ||
3329 | LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs` | ||
3330 | CPPFLAGS="$CPPFLAGS $LIBOPENSC_CFLAGS" | ||
3331 | LIBS="$LIBS $LIBOPENSC_LIBS" | ||
3332 | AC_DEFINE(SMARTCARD) | ||
3333 | AC_DEFINE(USE_OPENSC, 1, | ||
3334 | [Define if you want smartcard support | ||
3335 | using OpenSC]) | ||
3336 | SCARD_MSG="yes, using OpenSC" | ||
3337 | fi | ||
3338 | fi | ||
3339 | ] | ||
3340 | ) | ||
3341 | |||
3342 | # Check libraries needed by DNS fingerprint support | 3295 | # Check libraries needed by DNS fingerprint support |
3343 | AC_SEARCH_LIBS(getrrsetbyname, resolv, | 3296 | AC_SEARCH_LIBS(getrrsetbyname, resolv, |
3344 | [AC_DEFINE(HAVE_GETRRSETBYNAME, 1, | 3297 | [AC_DEFINE(HAVE_GETRRSETBYNAME, 1, |
@@ -3422,9 +3375,12 @@ AC_ARG_WITH(selinux, | |||
3422 | AC_DEFINE(WITH_SELINUX,1,[Define if you want SELinux support.]) | 3375 | AC_DEFINE(WITH_SELINUX,1,[Define if you want SELinux support.]) |
3423 | SELINUX_MSG="yes" | 3376 | SELINUX_MSG="yes" |
3424 | AC_CHECK_HEADER([selinux/selinux.h], , | 3377 | AC_CHECK_HEADER([selinux/selinux.h], , |
3425 | AC_MSG_ERROR(SELinux support requires selinux.h header)) | 3378 | AC_MSG_ERROR(SELinux support requires selinux.h header)) |
3426 | AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ], | 3379 | AC_CHECK_LIB(selinux, setexeccon, |
3427 | AC_MSG_ERROR(SELinux support requires libselinux library)) | 3380 | [ LIBSELINUX="-lselinux" |
3381 | LIBS="$LIBS -lselinux" | ||
3382 | ], | ||
3383 | AC_MSG_ERROR(SELinux support requires libselinux library)) | ||
3428 | SSHDLIBS="$SSHDLIBS $LIBSELINUX" | 3384 | SSHDLIBS="$SSHDLIBS $LIBSELINUX" |
3429 | AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) | 3385 | AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) |
3430 | LIBS="$save_LIBS" | 3386 | LIBS="$save_LIBS" |
@@ -4206,7 +4162,7 @@ fi | |||
4206 | AC_EXEEXT | 4162 | AC_EXEEXT |
4207 | AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \ | 4163 | AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \ |
4208 | openbsd-compat/Makefile openbsd-compat/regress/Makefile \ | 4164 | openbsd-compat/Makefile openbsd-compat/regress/Makefile \ |
4209 | scard/Makefile ssh_prng_cmds survey.sh]) | 4165 | ssh_prng_cmds survey.sh]) |
4210 | AC_OUTPUT | 4166 | AC_OUTPUT |
4211 | 4167 | ||
4212 | # Print summary of options | 4168 | # Print summary of options |