diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 365 |
1 files changed, 338 insertions, 27 deletions
@@ -1305,6 +1305,7 @@ Optional Features: | |||
1305 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | 1305 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) |
1306 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | 1306 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] |
1307 | --disable-largefile omit support for large files | 1307 | --disable-largefile omit support for large files |
1308 | --disable-pkcs11 disable PKCS#11 support code [no] | ||
1308 | --disable-strip Disable calling strip(1) on install | 1309 | --disable-strip Disable calling strip(1) on install |
1309 | --disable-etc-default-login Disable using PATH from /etc/default/login no | 1310 | --disable-etc-default-login Disable using PATH from /etc/default/login no |
1310 | --disable-lastlog disable use of lastlog even if detected no | 1311 | --disable-lastlog disable use of lastlog even if detected no |
@@ -7441,6 +7442,9 @@ fi | |||
7441 | 7442 | ||
7442 | 7443 | ||
7443 | 7444 | ||
7445 | |||
7446 | |||
7447 | |||
7444 | for ac_header in \ | 7448 | for ac_header in \ |
7445 | blf.h \ | 7449 | blf.h \ |
7446 | bstring.h \ | 7450 | bstring.h \ |
@@ -7449,6 +7453,7 @@ for ac_header in \ | |||
7449 | dirent.h \ | 7453 | dirent.h \ |
7450 | endian.h \ | 7454 | endian.h \ |
7451 | elf.h \ | 7455 | elf.h \ |
7456 | err.h \ | ||
7452 | features.h \ | 7457 | features.h \ |
7453 | fcntl.h \ | 7458 | fcntl.h \ |
7454 | floatingpoint.h \ | 7459 | floatingpoint.h \ |
@@ -7457,6 +7462,7 @@ for ac_header in \ | |||
7457 | ia.h \ | 7462 | ia.h \ |
7458 | iaf.h \ | 7463 | iaf.h \ |
7459 | inttypes.h \ | 7464 | inttypes.h \ |
7465 | langinfo.h \ | ||
7460 | limits.h \ | 7466 | limits.h \ |
7461 | locale.h \ | 7467 | locale.h \ |
7462 | login.h \ | 7468 | login.h \ |
@@ -7509,6 +7515,7 @@ for ac_header in \ | |||
7509 | utmp.h \ | 7515 | utmp.h \ |
7510 | utmpx.h \ | 7516 | utmpx.h \ |
7511 | vis.h \ | 7517 | vis.h \ |
7518 | wchar.h \ | ||
7512 | 7519 | ||
7513 | do | 7520 | do |
7514 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | 7521 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
@@ -8981,11 +8988,6 @@ _ACEOF | |||
8981 | 8988 | ||
8982 | 8989 | ||
8983 | cat >>confdefs.h <<\_ACEOF | 8990 | cat >>confdefs.h <<\_ACEOF |
8984 | #define NO_IPPORT_RESERVED_CONCEPT 1 | ||
8985 | _ACEOF | ||
8986 | |||
8987 | |||
8988 | cat >>confdefs.h <<\_ACEOF | ||
8989 | #define DISABLE_FD_PASSING 1 | 8991 | #define DISABLE_FD_PASSING 1 |
8990 | _ACEOF | 8992 | _ACEOF |
8991 | 8993 | ||
@@ -10374,6 +10376,30 @@ echo $ECHO_N "checking for seccomp architecture... $ECHO_C" >&6; } | |||
10374 | aarch64*-*) | 10376 | aarch64*-*) |
10375 | seccomp_audit_arch=AUDIT_ARCH_AARCH64 | 10377 | seccomp_audit_arch=AUDIT_ARCH_AARCH64 |
10376 | ;; | 10378 | ;; |
10379 | s390x-*) | ||
10380 | seccomp_audit_arch=AUDIT_ARCH_S390X | ||
10381 | ;; | ||
10382 | s390-*) | ||
10383 | seccomp_audit_arch=AUDIT_ARCH_S390 | ||
10384 | ;; | ||
10385 | powerpc64-*) | ||
10386 | seccomp_audit_arch=AUDIT_ARCH_PPC64 | ||
10387 | ;; | ||
10388 | powerpc64le-*) | ||
10389 | seccomp_audit_arch=AUDIT_ARCH_PPC64LE | ||
10390 | ;; | ||
10391 | mips-*) | ||
10392 | seccomp_audit_arch=AUDIT_ARCH_MIPS | ||
10393 | ;; | ||
10394 | mipsel-*) | ||
10395 | seccomp_audit_arch=AUDIT_ARCH_MIPSEL | ||
10396 | ;; | ||
10397 | mips64-*) | ||
10398 | seccomp_audit_arch=AUDIT_ARCH_MIPS64 | ||
10399 | ;; | ||
10400 | mips64el-*) | ||
10401 | seccomp_audit_arch=AUDIT_ARCH_MIPSEL64 | ||
10402 | ;; | ||
10377 | esac | 10403 | esac |
10378 | if test "x$seccomp_audit_arch" != "x" ; then | 10404 | if test "x$seccomp_audit_arch" != "x" ; then |
10379 | { echo "$as_me:$LINENO: result: \"$seccomp_audit_arch\"" >&5 | 10405 | { echo "$as_me:$LINENO: result: \"$seccomp_audit_arch\"" >&5 |
@@ -10401,6 +10427,7 @@ _ACEOF | |||
10401 | if test "x$withval" != "xno" ; then | 10427 | if test "x$withval" != "xno" ; then |
10402 | need_dash_r=1 | 10428 | need_dash_r=1 |
10403 | fi | 10429 | fi |
10430 | CPPFLAGS="$CPPFLAGS -D_OPENBSD_SOURCE" | ||
10404 | 10431 | ||
10405 | cat >>confdefs.h <<\_ACEOF | 10432 | cat >>confdefs.h <<\_ACEOF |
10406 | #define SSH_TUN_FREEBSD 1 | 10433 | #define SSH_TUN_FREEBSD 1 |
@@ -10867,6 +10894,100 @@ _ACEOF | |||
10867 | echo "${ECHO_T}no" >&6; } | 10894 | echo "${ECHO_T}no" >&6; } |
10868 | fi | 10895 | fi |
10869 | 10896 | ||
10897 | for ac_func in setpflags | ||
10898 | do | ||
10899 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
10900 | { echo "$as_me:$LINENO: checking for $ac_func" >&5 | ||
10901 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } | ||
10902 | if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | ||
10903 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10904 | else | ||
10905 | cat >conftest.$ac_ext <<_ACEOF | ||
10906 | /* confdefs.h. */ | ||
10907 | _ACEOF | ||
10908 | cat confdefs.h >>conftest.$ac_ext | ||
10909 | cat >>conftest.$ac_ext <<_ACEOF | ||
10910 | /* end confdefs.h. */ | ||
10911 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
10912 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
10913 | #define $ac_func innocuous_$ac_func | ||
10914 | |||
10915 | /* System header to define __stub macros and hopefully few prototypes, | ||
10916 | which can conflict with char $ac_func (); below. | ||
10917 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
10918 | <limits.h> exists even on freestanding compilers. */ | ||
10919 | |||
10920 | #ifdef __STDC__ | ||
10921 | # include <limits.h> | ||
10922 | #else | ||
10923 | # include <assert.h> | ||
10924 | #endif | ||
10925 | |||
10926 | #undef $ac_func | ||
10927 | |||
10928 | /* Override any GCC internal prototype to avoid an error. | ||
10929 | Use char because int might match the return type of a GCC | ||
10930 | builtin and then its argument prototype would still apply. */ | ||
10931 | #ifdef __cplusplus | ||
10932 | extern "C" | ||
10933 | #endif | ||
10934 | char $ac_func (); | ||
10935 | /* The GNU C library defines this for functions which it implements | ||
10936 | to always fail with ENOSYS. Some functions are actually named | ||
10937 | something starting with __ and the normal name is an alias. */ | ||
10938 | #if defined __stub_$ac_func || defined __stub___$ac_func | ||
10939 | choke me | ||
10940 | #endif | ||
10941 | |||
10942 | int | ||
10943 | main () | ||
10944 | { | ||
10945 | return $ac_func (); | ||
10946 | ; | ||
10947 | return 0; | ||
10948 | } | ||
10949 | _ACEOF | ||
10950 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
10951 | if { (ac_try="$ac_link" | ||
10952 | case "(($ac_try" in | ||
10953 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10954 | *) ac_try_echo=$ac_try;; | ||
10955 | esac | ||
10956 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10957 | (eval "$ac_link") 2>conftest.er1 | ||
10958 | ac_status=$? | ||
10959 | grep -v '^ *+' conftest.er1 >conftest.err | ||
10960 | rm -f conftest.er1 | ||
10961 | cat conftest.err >&5 | ||
10962 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10963 | (exit $ac_status); } && { | ||
10964 | test -z "$ac_c_werror_flag" || | ||
10965 | test ! -s conftest.err | ||
10966 | } && test -s conftest$ac_exeext && | ||
10967 | $as_test_x conftest$ac_exeext; then | ||
10968 | eval "$as_ac_var=yes" | ||
10969 | else | ||
10970 | echo "$as_me: failed program was:" >&5 | ||
10971 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
10972 | |||
10973 | eval "$as_ac_var=no" | ||
10974 | fi | ||
10975 | |||
10976 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
10977 | conftest$ac_exeext conftest.$ac_ext | ||
10978 | fi | ||
10979 | ac_res=`eval echo '${'$as_ac_var'}'` | ||
10980 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
10981 | echo "${ECHO_T}$ac_res" >&6; } | ||
10982 | if test `eval echo '${'$as_ac_var'}'` = yes; then | ||
10983 | cat >>confdefs.h <<_ACEOF | ||
10984 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | ||
10985 | _ACEOF | ||
10986 | |||
10987 | fi | ||
10988 | done | ||
10989 | |||
10990 | |||
10870 | for ac_func in setppriv | 10991 | for ac_func in setppriv |
10871 | do | 10992 | do |
10872 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 10993 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
@@ -15446,6 +15567,70 @@ fi | |||
15446 | 15567 | ||
15447 | 15568 | ||
15448 | 15569 | ||
15570 | { echo "$as_me:$LINENO: checking whether VIS_ALL is declared" >&5 | ||
15571 | echo $ECHO_N "checking whether VIS_ALL is declared... $ECHO_C" >&6; } | ||
15572 | if test "${ac_cv_have_decl_VIS_ALL+set}" = set; then | ||
15573 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
15574 | else | ||
15575 | cat >conftest.$ac_ext <<_ACEOF | ||
15576 | /* confdefs.h. */ | ||
15577 | _ACEOF | ||
15578 | cat confdefs.h >>conftest.$ac_ext | ||
15579 | cat >>conftest.$ac_ext <<_ACEOF | ||
15580 | /* end confdefs.h. */ | ||
15581 | #include <vis.h> | ||
15582 | |||
15583 | int | ||
15584 | main () | ||
15585 | { | ||
15586 | #ifndef VIS_ALL | ||
15587 | (void) VIS_ALL; | ||
15588 | #endif | ||
15589 | |||
15590 | ; | ||
15591 | return 0; | ||
15592 | } | ||
15593 | _ACEOF | ||
15594 | rm -f conftest.$ac_objext | ||
15595 | if { (ac_try="$ac_compile" | ||
15596 | case "(($ac_try" in | ||
15597 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15598 | *) ac_try_echo=$ac_try;; | ||
15599 | esac | ||
15600 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15601 | (eval "$ac_compile") 2>conftest.er1 | ||
15602 | ac_status=$? | ||
15603 | grep -v '^ *+' conftest.er1 >conftest.err | ||
15604 | rm -f conftest.er1 | ||
15605 | cat conftest.err >&5 | ||
15606 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15607 | (exit $ac_status); } && { | ||
15608 | test -z "$ac_c_werror_flag" || | ||
15609 | test ! -s conftest.err | ||
15610 | } && test -s conftest.$ac_objext; then | ||
15611 | ac_cv_have_decl_VIS_ALL=yes | ||
15612 | else | ||
15613 | echo "$as_me: failed program was:" >&5 | ||
15614 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
15615 | |||
15616 | ac_cv_have_decl_VIS_ALL=no | ||
15617 | fi | ||
15618 | |||
15619 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15620 | fi | ||
15621 | { echo "$as_me:$LINENO: result: $ac_cv_have_decl_VIS_ALL" >&5 | ||
15622 | echo "${ECHO_T}$ac_cv_have_decl_VIS_ALL" >&6; } | ||
15623 | if test $ac_cv_have_decl_VIS_ALL = yes; then | ||
15624 | : | ||
15625 | else | ||
15626 | |||
15627 | cat >>confdefs.h <<\_ACEOF | ||
15628 | #define BROKEN_STRNVIS 1 | ||
15629 | _ACEOF | ||
15630 | |||
15631 | fi | ||
15632 | |||
15633 | |||
15449 | { echo "$as_me:$LINENO: checking whether struct dirent allocates space for d_name" >&5 | 15634 | { echo "$as_me:$LINENO: checking whether struct dirent allocates space for d_name" >&5 |
15450 | echo $ECHO_N "checking whether struct dirent allocates space for d_name... $ECHO_C" >&6; } | 15635 | echo $ECHO_N "checking whether struct dirent allocates space for d_name... $ECHO_C" >&6; } |
15451 | if test "$cross_compiling" = yes; then | 15636 | if test "$cross_compiling" = yes; then |
@@ -15616,7 +15801,7 @@ fi | |||
15616 | 15801 | ||
15617 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | 15802 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
15618 | conftest$ac_exeext conftest.$ac_ext | 15803 | conftest$ac_exeext conftest.$ac_ext |
15619 | { echo "$as_me:$LINENO: checking if skeychallenge takes 4 arguments" >&5 | 15804 | { echo "$as_me:$LINENO: checking if skeychallenge takes 4 arguments" >&5 |
15620 | echo $ECHO_N "checking if skeychallenge takes 4 arguments... $ECHO_C" >&6; } | 15805 | echo $ECHO_N "checking if skeychallenge takes 4 arguments... $ECHO_C" >&6; } |
15621 | cat >conftest.$ac_ext <<_ACEOF | 15806 | cat >conftest.$ac_ext <<_ACEOF |
15622 | /* confdefs.h. */ | 15807 | /* confdefs.h. */ |
@@ -15871,7 +16056,7 @@ fi | |||
15871 | if test "x$PKGCONFIG" != "xno"; then | 16056 | if test "x$PKGCONFIG" != "xno"; then |
15872 | { echo "$as_me:$LINENO: checking if $PKGCONFIG knows about libedit" >&5 | 16057 | { echo "$as_me:$LINENO: checking if $PKGCONFIG knows about libedit" >&5 |
15873 | echo $ECHO_N "checking if $PKGCONFIG knows about libedit... $ECHO_C" >&6; } | 16058 | echo $ECHO_N "checking if $PKGCONFIG knows about libedit... $ECHO_C" >&6; } |
15874 | if "$PKGCONFIG" libedit; then | 16059 | if "$PKGCONFIG" libedit; then |
15875 | { echo "$as_me:$LINENO: result: yes" >&5 | 16060 | { echo "$as_me:$LINENO: result: yes" >&5 |
15876 | echo "${ECHO_T}yes" >&6; } | 16061 | echo "${ECHO_T}yes" >&6; } |
15877 | use_pkgconfig_for_libedit=yes | 16062 | use_pkgconfig_for_libedit=yes |
@@ -16384,7 +16569,7 @@ cat >>confdefs.h <<\_ACEOF | |||
16384 | _ACEOF | 16569 | _ACEOF |
16385 | 16570 | ||
16386 | if test "$sol2ver" -ge 11; then | 16571 | if test "$sol2ver" -ge 11; then |
16387 | SSHDLIBS="$SSHDLIBS -lscf" | 16572 | SSHDLIBS="$SSHDLIBS -lscf" |
16388 | 16573 | ||
16389 | cat >>confdefs.h <<\_ACEOF | 16574 | cat >>confdefs.h <<\_ACEOF |
16390 | #define BROKEN_BSM_API 1 | 16575 | #define BROKEN_BSM_API 1 |
@@ -16895,6 +17080,8 @@ fi | |||
16895 | 17080 | ||
16896 | 17081 | ||
16897 | 17082 | ||
17083 | |||
17084 | |||
16898 | for ac_func in \ | 17085 | for ac_func in \ |
16899 | Blowfish_initstate \ | 17086 | Blowfish_initstate \ |
16900 | Blowfish_expandstate \ | 17087 | Blowfish_expandstate \ |
@@ -16914,6 +17101,8 @@ for ac_func in \ | |||
16914 | closefrom \ | 17101 | closefrom \ |
16915 | dirfd \ | 17102 | dirfd \ |
16916 | endgrent \ | 17103 | endgrent \ |
17104 | err \ | ||
17105 | errx \ | ||
16917 | explicit_bzero \ | 17106 | explicit_bzero \ |
16918 | fchmod \ | 17107 | fchmod \ |
16919 | fchown \ | 17108 | fchown \ |
@@ -16940,7 +17129,6 @@ for ac_func in \ | |||
16940 | inet_ntop \ | 17129 | inet_ntop \ |
16941 | innetgr \ | 17130 | innetgr \ |
16942 | login_getcapbool \ | 17131 | login_getcapbool \ |
16943 | mblen \ | ||
16944 | md5_crypt \ | 17132 | md5_crypt \ |
16945 | memmove \ | 17133 | memmove \ |
16946 | memset_s \ | 17134 | memset_s \ |
@@ -17005,6 +17193,7 @@ for ac_func in \ | |||
17005 | vasprintf \ | 17193 | vasprintf \ |
17006 | vsnprintf \ | 17194 | vsnprintf \ |
17007 | waitpid \ | 17195 | waitpid \ |
17196 | warn \ | ||
17008 | 17197 | ||
17009 | do | 17198 | do |
17010 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 17199 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
@@ -17099,6 +17288,107 @@ fi | |||
17099 | done | 17288 | done |
17100 | 17289 | ||
17101 | 17290 | ||
17291 | saved_CFLAGS="$CFLAGS" | ||
17292 | CFLAGS="$CFLAGS -D_XOPEN_SOURCE" | ||
17293 | |||
17294 | |||
17295 | |||
17296 | |||
17297 | for ac_func in mblen mbtowc nl_langinfo wcwidth | ||
17298 | do | ||
17299 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
17300 | { echo "$as_me:$LINENO: checking for $ac_func" >&5 | ||
17301 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } | ||
17302 | if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | ||
17303 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
17304 | else | ||
17305 | cat >conftest.$ac_ext <<_ACEOF | ||
17306 | /* confdefs.h. */ | ||
17307 | _ACEOF | ||
17308 | cat confdefs.h >>conftest.$ac_ext | ||
17309 | cat >>conftest.$ac_ext <<_ACEOF | ||
17310 | /* end confdefs.h. */ | ||
17311 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
17312 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
17313 | #define $ac_func innocuous_$ac_func | ||
17314 | |||
17315 | /* System header to define __stub macros and hopefully few prototypes, | ||
17316 | which can conflict with char $ac_func (); below. | ||
17317 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
17318 | <limits.h> exists even on freestanding compilers. */ | ||
17319 | |||
17320 | #ifdef __STDC__ | ||
17321 | # include <limits.h> | ||
17322 | #else | ||
17323 | # include <assert.h> | ||
17324 | #endif | ||
17325 | |||
17326 | #undef $ac_func | ||
17327 | |||
17328 | /* Override any GCC internal prototype to avoid an error. | ||
17329 | Use char because int might match the return type of a GCC | ||
17330 | builtin and then its argument prototype would still apply. */ | ||
17331 | #ifdef __cplusplus | ||
17332 | extern "C" | ||
17333 | #endif | ||
17334 | char $ac_func (); | ||
17335 | /* The GNU C library defines this for functions which it implements | ||
17336 | to always fail with ENOSYS. Some functions are actually named | ||
17337 | something starting with __ and the normal name is an alias. */ | ||
17338 | #if defined __stub_$ac_func || defined __stub___$ac_func | ||
17339 | choke me | ||
17340 | #endif | ||
17341 | |||
17342 | int | ||
17343 | main () | ||
17344 | { | ||
17345 | return $ac_func (); | ||
17346 | ; | ||
17347 | return 0; | ||
17348 | } | ||
17349 | _ACEOF | ||
17350 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
17351 | if { (ac_try="$ac_link" | ||
17352 | case "(($ac_try" in | ||
17353 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17354 | *) ac_try_echo=$ac_try;; | ||
17355 | esac | ||
17356 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17357 | (eval "$ac_link") 2>conftest.er1 | ||
17358 | ac_status=$? | ||
17359 | grep -v '^ *+' conftest.er1 >conftest.err | ||
17360 | rm -f conftest.er1 | ||
17361 | cat conftest.err >&5 | ||
17362 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17363 | (exit $ac_status); } && { | ||
17364 | test -z "$ac_c_werror_flag" || | ||
17365 | test ! -s conftest.err | ||
17366 | } && test -s conftest$ac_exeext && | ||
17367 | $as_test_x conftest$ac_exeext; then | ||
17368 | eval "$as_ac_var=yes" | ||
17369 | else | ||
17370 | echo "$as_me: failed program was:" >&5 | ||
17371 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
17372 | |||
17373 | eval "$as_ac_var=no" | ||
17374 | fi | ||
17375 | |||
17376 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
17377 | conftest$ac_exeext conftest.$ac_ext | ||
17378 | fi | ||
17379 | ac_res=`eval echo '${'$as_ac_var'}'` | ||
17380 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
17381 | echo "${ECHO_T}$ac_res" >&6; } | ||
17382 | if test `eval echo '${'$as_ac_var'}'` = yes; then | ||
17383 | cat >>confdefs.h <<_ACEOF | ||
17384 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | ||
17385 | _ACEOF | ||
17386 | |||
17387 | fi | ||
17388 | done | ||
17389 | |||
17390 | CFLAGS="$saved_CFLAGS" | ||
17391 | |||
17102 | cat >conftest.$ac_ext <<_ACEOF | 17392 | cat >conftest.$ac_ext <<_ACEOF |
17103 | /* confdefs.h. */ | 17393 | /* confdefs.h. */ |
17104 | _ACEOF | 17394 | _ACEOF |
@@ -17148,8 +17438,20 @@ fi | |||
17148 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | 17438 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
17149 | conftest$ac_exeext conftest.$ac_ext | 17439 | conftest$ac_exeext conftest.$ac_ext |
17150 | 17440 | ||
17441 | disable_pkcs11= | ||
17442 | # Check whether --enable-pkcs11 was given. | ||
17443 | if test "${enable_pkcs11+set}" = set; then | ||
17444 | enableval=$enable_pkcs11; | ||
17445 | if test "x$enableval" = "xno" ; then | ||
17446 | disable_pkcs11=1 | ||
17447 | fi | ||
17448 | |||
17449 | |||
17450 | fi | ||
17451 | |||
17452 | |||
17151 | # PKCS11 depends on OpenSSL. | 17453 | # PKCS11 depends on OpenSSL. |
17152 | if test "x$openssl" = "xyes" ; then | 17454 | if test "x$openssl" = "xyes" && test "x$disable_pkcs11" = "x"; then |
17153 | # PKCS#11 support requires dlopen() and co | 17455 | # PKCS#11 support requires dlopen() and co |
17154 | { echo "$as_me:$LINENO: checking for library containing dlopen" >&5 | 17456 | { echo "$as_me:$LINENO: checking for library containing dlopen" >&5 |
17155 | echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; } | 17457 | echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; } |
@@ -21388,8 +21690,9 @@ main () | |||
21388 | if(fd == NULL) | 21690 | if(fd == NULL) |
21389 | exit(1); | 21691 | exit(1); |
21390 | 21692 | ||
21391 | if ((rc = fprintf(fd ,"%08lx (%s)\n", | 21693 | if ((rc = fprintf(fd, "%08lx (%s)\n", |
21392 | (unsigned long)OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT)) <0) | 21694 | (unsigned long)OPENSSL_VERSION_NUMBER, |
21695 | OPENSSL_VERSION_TEXT)) < 0) | ||
21393 | exit(1); | 21696 | exit(1); |
21394 | 21697 | ||
21395 | exit(0); | 21698 | exit(0); |
@@ -21476,8 +21779,8 @@ main () | |||
21476 | if(fd == NULL) | 21779 | if(fd == NULL) |
21477 | exit(1); | 21780 | exit(1); |
21478 | 21781 | ||
21479 | if ((rc = fprintf(fd ,"%08x (%s)\n", SSLeay(), | 21782 | if ((rc = fprintf(fd, "%08lx (%s)\n", (unsigned long)SSLeay(), |
21480 | SSLeay_version(SSLEAY_VERSION))) <0) | 21783 | SSLeay_version(SSLEAY_VERSION))) < 0) |
21481 | exit(1); | 21784 | exit(1); |
21482 | 21785 | ||
21483 | exit(0); | 21786 | exit(0); |
@@ -22110,7 +22413,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
22110 | { echo "$as_me:$LINENO: result: no" >&5 | 22413 | { echo "$as_me:$LINENO: result: no" >&5 |
22111 | echo "${ECHO_T}no" >&6; } | 22414 | echo "${ECHO_T}no" >&6; } |
22112 | unsupported_algorithms="$unsupported_cipers \ | 22415 | unsupported_algorithms="$unsupported_cipers \ |
22113 | aes128-gcm@openssh.com aes256-gcm@openssh.com" | 22416 | aes128-gcm@openssh.com \ |
22417 | aes256-gcm@openssh.com" | ||
22114 | 22418 | ||
22115 | 22419 | ||
22116 | fi | 22420 | fi |
@@ -22606,9 +22910,11 @@ _ACEOF | |||
22606 | 22910 | ||
22607 | else | 22911 | else |
22608 | unsupported_algorithms="$unsupported_algorithms \ | 22912 | unsupported_algorithms="$unsupported_algorithms \ |
22609 | hmac-sha2-256 hmac-sha2-512 \ | 22913 | hmac-sha2-256 \ |
22914 | hmac-sha2-512 \ | ||
22610 | diffie-hellman-group-exchange-sha256 \ | 22915 | diffie-hellman-group-exchange-sha256 \ |
22611 | hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com" | 22916 | hmac-sha2-256-etm@openssh.com \ |
22917 | hmac-sha2-512-etm@openssh.com" | ||
22612 | 22918 | ||
22613 | 22919 | ||
22614 | fi | 22920 | fi |
@@ -22708,8 +23014,8 @@ _ACEOF | |||
22708 | 23014 | ||
22709 | else | 23015 | else |
22710 | unsupported_algorithms="$unsupported_algorithms \ | 23016 | unsupported_algorithms="$unsupported_algorithms \ |
22711 | hmac-ripemd160 | 23017 | hmac-ripemd160 \ |
22712 | hmac-ripemd160@openssh.com | 23018 | hmac-ripemd160@openssh.com \ |
22713 | hmac-ripemd160-etm@openssh.com" | 23019 | hmac-ripemd160-etm@openssh.com" |
22714 | 23020 | ||
22715 | 23021 | ||
@@ -22996,8 +23302,10 @@ _ACEOF | |||
22996 | TEST_SSH_ECC=yes | 23302 | TEST_SSH_ECC=yes |
22997 | COMMENT_OUT_ECC="" | 23303 | COMMENT_OUT_ECC="" |
22998 | else | 23304 | else |
22999 | unsupported_algorithms="$unsupported_algorithms ecdsa-sha2-nistp256 \ | 23305 | unsupported_algorithms="$unsupported_algorithms \ |
23000 | ecdh-sha2-nistp256 ecdsa-sha2-nistp256-cert-v01@openssh.com" | 23306 | ecdsa-sha2-nistp256 \ |
23307 | ecdh-sha2-nistp256 \ | ||
23308 | ecdsa-sha2-nistp256-cert-v01@openssh.com" | ||
23001 | fi | 23309 | fi |
23002 | if test x$enable_nistp384 = x1; then | 23310 | if test x$enable_nistp384 = x1; then |
23003 | 23311 | ||
@@ -23008,8 +23316,10 @@ _ACEOF | |||
23008 | TEST_SSH_ECC=yes | 23316 | TEST_SSH_ECC=yes |
23009 | COMMENT_OUT_ECC="" | 23317 | COMMENT_OUT_ECC="" |
23010 | else | 23318 | else |
23011 | unsupported_algorithms="$unsupported_algorithms ecdsa-sha2-nistp384 \ | 23319 | unsupported_algorithms="$unsupported_algorithms \ |
23012 | ecdh-sha2-nistp384 ecdsa-sha2-nistp384-cert-v01@openssh.com" | 23320 | ecdsa-sha2-nistp384 \ |
23321 | ecdh-sha2-nistp384 \ | ||
23322 | ecdsa-sha2-nistp384-cert-v01@openssh.com" | ||
23013 | fi | 23323 | fi |
23014 | if test x$enable_nistp521 = x1; then | 23324 | if test x$enable_nistp521 = x1; then |
23015 | 23325 | ||
@@ -23020,8 +23330,10 @@ _ACEOF | |||
23020 | TEST_SSH_ECC=yes | 23330 | TEST_SSH_ECC=yes |
23021 | COMMENT_OUT_ECC="" | 23331 | COMMENT_OUT_ECC="" |
23022 | else | 23332 | else |
23023 | unsupported_algorithms="$unsupported_algorithms ecdh-sha2-nistp521 \ | 23333 | unsupported_algorithms="$unsupported_algorithms \ |
23024 | ecdsa-sha2-nistp521 ecdsa-sha2-nistp521-cert-v01@openssh.com" | 23334 | ecdh-sha2-nistp521 \ |
23335 | ecdsa-sha2-nistp521 \ | ||
23336 | ecdsa-sha2-nistp521-cert-v01@openssh.com" | ||
23025 | fi | 23337 | fi |
23026 | 23338 | ||
23027 | 23339 | ||
@@ -32808,7 +33120,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
32808 | echo "${ECHO_T}no" >&6; } | 33120 | echo "${ECHO_T}no" >&6; } |
32809 | K5LIBS="-lkrb5 -lk5crypto -lcom_err" | 33121 | K5LIBS="-lkrb5 -lk5crypto -lcom_err" |
32810 | 33122 | ||
32811 | |||
32812 | fi | 33123 | fi |
32813 | 33124 | ||
32814 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 33125 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
@@ -34471,7 +34782,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |||
34471 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 34782 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
34472 | (exit $ac_status); }; }; then | 34783 | (exit $ac_status); }; }; then |
34473 | 34784 | ||
34474 | maildir_what=`awk -F: '{print $1}' conftest.maildir` | 34785 | maildir_what=`awk -F: '{print $1}' conftest.maildir` |
34475 | maildir=`awk -F: '{print $2}' conftest.maildir \ | 34786 | maildir=`awk -F: '{print $2}' conftest.maildir \ |
34476 | | sed 's|/$||'` | 34787 | | sed 's|/$||'` |
34477 | { echo "$as_me:$LINENO: result: Using: $maildir from $maildir_what" >&5 | 34788 | { echo "$as_me:$LINENO: result: Using: $maildir from $maildir_what" >&5 |