diff options
author | Colin Watson <cjwatson@debian.org> | 2015-08-19 17:00:17 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-08-19 17:00:17 +0100 |
commit | 544df7a04ae5b5c1fc30be7c445ad685d7a02dc9 (patch) | |
tree | 33d2a87dd50fe5894ac6ec4579c83401b7ab00a4 /configure | |
parent | baccdb349b31c47cd76fb63211f754ed33a9707e (diff) | |
parent | 7de4b03a6e4071d454b72927ffaf52949fa34545 (diff) |
Import openssh_6.9p1.orig.tar.gz
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 124 |
1 files changed, 100 insertions, 24 deletions
@@ -677,6 +677,7 @@ INSTALL_PROGRAM | |||
677 | INSTALL_SCRIPT | 677 | INSTALL_SCRIPT |
678 | INSTALL_DATA | 678 | INSTALL_DATA |
679 | AR | 679 | AR |
680 | ac_ct_AR | ||
680 | CAT | 681 | CAT |
681 | KILL | 682 | KILL |
682 | PERL | 683 | PERL |
@@ -1319,7 +1320,7 @@ Optional Packages: | |||
1319 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] | 1320 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
1320 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) | 1321 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) |
1321 | --without-openssl Disable use of OpenSSL; use only limited internal crypto **EXPERIMENTAL** | 1322 | --without-openssl Disable use of OpenSSL; use only limited internal crypto **EXPERIMENTAL** |
1322 | --without-ssh1 Disable support for SSH protocol 1 | 1323 | --without-ssh1 Enable support for SSH protocol 1 |
1323 | --without-stackprotect Don't use compiler's stack protection | 1324 | --without-stackprotect Don't use compiler's stack protection |
1324 | --without-hardening Don't use toolchain hardening flags | 1325 | --without-hardening Don't use toolchain hardening flags |
1325 | --without-rpath Disable auto-added -R linker paths | 1326 | --without-rpath Disable auto-added -R linker paths |
@@ -1354,8 +1355,8 @@ Optional Packages: | |||
1354 | --with-mantype=man|cat|doc Set man page type | 1355 | --with-mantype=man|cat|doc Set man page type |
1355 | --with-md5-passwords Enable use of MD5 passwords | 1356 | --with-md5-passwords Enable use of MD5 passwords |
1356 | --without-shadow Disable shadow password support | 1357 | --without-shadow Disable shadow password support |
1357 | --with-ipaddr-display Use ip address instead of hostname in \$DISPLAY | 1358 | --with-ipaddr-display Use ip address instead of hostname in $DISPLAY |
1358 | --with-default-path= Specify default \$PATH environment for server | 1359 | --with-default-path= Specify default $PATH environment for server |
1359 | --with-superuser-path= Specify different path for super-user | 1360 | --with-superuser-path= Specify different path for super-user |
1360 | --with-4in6 Check for and convert IPv4 in IPv6 mapped addresses | 1361 | --with-4in6 Check for and convert IPv4 in IPv6 mapped addresses |
1361 | --with-bsd-auth Enable BSD auth support | 1362 | --with-bsd-auth Enable BSD auth support |
@@ -4253,26 +4254,27 @@ echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } | |||
4253 | EGREP="$ac_cv_path_EGREP" | 4254 | EGREP="$ac_cv_path_EGREP" |
4254 | 4255 | ||
4255 | 4256 | ||
4256 | # Extract the first word of "ar", so it can be a program name with args. | 4257 | if test -n "$ac_tool_prefix"; then |
4257 | set dummy ar; ac_word=$2 | 4258 | for ac_prog in ar |
4259 | do | ||
4260 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
4261 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
4258 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 4262 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4259 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 4263 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
4260 | if test "${ac_cv_path_AR+set}" = set; then | 4264 | if test "${ac_cv_prog_AR+set}" = set; then |
4261 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4265 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
4262 | else | 4266 | else |
4263 | case $AR in | 4267 | if test -n "$AR"; then |
4264 | [\\/]* | ?:[\\/]*) | 4268 | ac_cv_prog_AR="$AR" # Let the user override the test. |
4265 | ac_cv_path_AR="$AR" # Let the user override the test with a path. | 4269 | else |
4266 | ;; | 4270 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4267 | *) | ||
4268 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4269 | for as_dir in $PATH | 4271 | for as_dir in $PATH |
4270 | do | 4272 | do |
4271 | IFS=$as_save_IFS | 4273 | IFS=$as_save_IFS |
4272 | test -z "$as_dir" && as_dir=. | 4274 | test -z "$as_dir" && as_dir=. |
4273 | for ac_exec_ext in '' $ac_executable_extensions; do | 4275 | for ac_exec_ext in '' $ac_executable_extensions; do |
4274 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 4276 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
4275 | ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" | 4277 | ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
4276 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 4278 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4277 | break 2 | 4279 | break 2 |
4278 | fi | 4280 | fi |
@@ -4280,10 +4282,9 @@ done | |||
4280 | done | 4282 | done |
4281 | IFS=$as_save_IFS | 4283 | IFS=$as_save_IFS |
4282 | 4284 | ||
4283 | ;; | ||
4284 | esac | ||
4285 | fi | 4285 | fi |
4286 | AR=$ac_cv_path_AR | 4286 | fi |
4287 | AR=$ac_cv_prog_AR | ||
4287 | if test -n "$AR"; then | 4288 | if test -n "$AR"; then |
4288 | { echo "$as_me:$LINENO: result: $AR" >&5 | 4289 | { echo "$as_me:$LINENO: result: $AR" >&5 |
4289 | echo "${ECHO_T}$AR" >&6; } | 4290 | echo "${ECHO_T}$AR" >&6; } |
@@ -4293,6 +4294,70 @@ echo "${ECHO_T}no" >&6; } | |||
4293 | fi | 4294 | fi |
4294 | 4295 | ||
4295 | 4296 | ||
4297 | test -n "$AR" && break | ||
4298 | done | ||
4299 | fi | ||
4300 | if test -z "$AR"; then | ||
4301 | ac_ct_AR=$AR | ||
4302 | for ac_prog in ar | ||
4303 | do | ||
4304 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
4305 | set dummy $ac_prog; ac_word=$2 | ||
4306 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
4307 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
4308 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then | ||
4309 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4310 | else | ||
4311 | if test -n "$ac_ct_AR"; then | ||
4312 | ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. | ||
4313 | else | ||
4314 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4315 | for as_dir in $PATH | ||
4316 | do | ||
4317 | IFS=$as_save_IFS | ||
4318 | test -z "$as_dir" && as_dir=. | ||
4319 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
4320 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
4321 | ac_cv_prog_ac_ct_AR="$ac_prog" | ||
4322 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4323 | break 2 | ||
4324 | fi | ||
4325 | done | ||
4326 | done | ||
4327 | IFS=$as_save_IFS | ||
4328 | |||
4329 | fi | ||
4330 | fi | ||
4331 | ac_ct_AR=$ac_cv_prog_ac_ct_AR | ||
4332 | if test -n "$ac_ct_AR"; then | ||
4333 | { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 | ||
4334 | echo "${ECHO_T}$ac_ct_AR" >&6; } | ||
4335 | else | ||
4336 | { echo "$as_me:$LINENO: result: no" >&5 | ||
4337 | echo "${ECHO_T}no" >&6; } | ||
4338 | fi | ||
4339 | |||
4340 | |||
4341 | test -n "$ac_ct_AR" && break | ||
4342 | done | ||
4343 | |||
4344 | if test "x$ac_ct_AR" = x; then | ||
4345 | AR="" | ||
4346 | else | ||
4347 | case $cross_compiling:$ac_tool_warned in | ||
4348 | yes:) | ||
4349 | { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
4350 | whose name does not start with the host triplet. If you think this | ||
4351 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
4352 | echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
4353 | whose name does not start with the host triplet. If you think this | ||
4354 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
4355 | ac_tool_warned=yes ;; | ||
4356 | esac | ||
4357 | AR=$ac_ct_AR | ||
4358 | fi | ||
4359 | fi | ||
4360 | |||
4296 | # Extract the first word of "cat", so it can be a program name with args. | 4361 | # Extract the first word of "cat", so it can be a program name with args. |
4297 | set dummy cat; ac_word=$2 | 4362 | set dummy cat; ac_word=$2 |
4298 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 4363 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 |
@@ -5737,12 +5802,19 @@ fi | |||
5737 | # Check whether --with-ssh1 was given. | 5802 | # Check whether --with-ssh1 was given. |
5738 | if test "${with_ssh1+set}" = set; then | 5803 | if test "${with_ssh1+set}" = set; then |
5739 | withval=$with_ssh1; | 5804 | withval=$with_ssh1; |
5740 | if test "x$withval" = "xno" ; then | 5805 | if test "x$withval" = "xyes" ; then |
5741 | ssh1=no | 5806 | if test "x$openssl" = "xno" ; then |
5742 | elif test "x$openssl" = "xno" ; then | 5807 | { { echo "$as_me:$LINENO: error: Cannot enable SSH protocol 1 with OpenSSL disabled" >&5 |
5743 | { { echo "$as_me:$LINENO: error: Cannot enable SSH protocol 1 with OpenSSL disabled" >&5 | ||
5744 | echo "$as_me: error: Cannot enable SSH protocol 1 with OpenSSL disabled" >&2;} | 5808 | echo "$as_me: error: Cannot enable SSH protocol 1 with OpenSSL disabled" >&2;} |
5745 | { (exit 1); exit 1; }; } | 5809 | { (exit 1); exit 1; }; } |
5810 | fi | ||
5811 | ssh1=yes | ||
5812 | elif test "x$withval" = "xno" ; then | ||
5813 | ssh1=no | ||
5814 | else | ||
5815 | { { echo "$as_me:$LINENO: error: unknown --with-ssh1 argument" >&5 | ||
5816 | echo "$as_me: error: unknown --with-ssh1 argument" >&2;} | ||
5817 | { (exit 1); exit 1; }; } | ||
5746 | fi | 5818 | fi |
5747 | 5819 | ||
5748 | 5820 | ||
@@ -10218,9 +10290,12 @@ echo $ECHO_N "checking for seccomp architecture... $ECHO_C" >&6; } | |||
10218 | i*86-*) | 10290 | i*86-*) |
10219 | seccomp_audit_arch=AUDIT_ARCH_I386 | 10291 | seccomp_audit_arch=AUDIT_ARCH_I386 |
10220 | ;; | 10292 | ;; |
10221 | arm*-*) | 10293 | arm*-*) |
10222 | seccomp_audit_arch=AUDIT_ARCH_ARM | 10294 | seccomp_audit_arch=AUDIT_ARCH_ARM |
10223 | ;; | 10295 | ;; |
10296 | aarch64*-*) | ||
10297 | seccomp_audit_arch=AUDIT_ARCH_AARCH64 | ||
10298 | ;; | ||
10224 | esac | 10299 | esac |
10225 | if test "x$seccomp_audit_arch" != "x" ; then | 10300 | if test "x$seccomp_audit_arch" != "x" ; then |
10226 | { echo "$as_me:$LINENO: result: \"$seccomp_audit_arch\"" >&5 | 10301 | { echo "$as_me:$LINENO: result: \"$seccomp_audit_arch\"" >&5 |
@@ -36007,6 +36082,7 @@ INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim | |||
36007 | INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim | 36082 | INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim |
36008 | INSTALL_DATA!$INSTALL_DATA$ac_delim | 36083 | INSTALL_DATA!$INSTALL_DATA$ac_delim |
36009 | AR!$AR$ac_delim | 36084 | AR!$AR$ac_delim |
36085 | ac_ct_AR!$ac_ct_AR$ac_delim | ||
36010 | CAT!$CAT$ac_delim | 36086 | CAT!$CAT$ac_delim |
36011 | KILL!$KILL$ac_delim | 36087 | KILL!$KILL$ac_delim |
36012 | PERL!$PERL$ac_delim | 36088 | PERL!$PERL$ac_delim |
@@ -36042,7 +36118,6 @@ STRIP_OPT!$STRIP_OPT$ac_delim | |||
36042 | XAUTH_PATH!$XAUTH_PATH$ac_delim | 36118 | XAUTH_PATH!$XAUTH_PATH$ac_delim |
36043 | MANTYPE!$MANTYPE$ac_delim | 36119 | MANTYPE!$MANTYPE$ac_delim |
36044 | mansubdir!$mansubdir$ac_delim | 36120 | mansubdir!$mansubdir$ac_delim |
36045 | user_path!$user_path$ac_delim | ||
36046 | _ACEOF | 36121 | _ACEOF |
36047 | 36122 | ||
36048 | if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then | 36123 | if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then |
@@ -36084,6 +36159,7 @@ _ACEOF | |||
36084 | ac_delim='%!_!# ' | 36159 | ac_delim='%!_!# ' |
36085 | for ac_last_try in false false false false false :; do | 36160 | for ac_last_try in false false false false false :; do |
36086 | cat >conf$$subs.sed <<_ACEOF | 36161 | cat >conf$$subs.sed <<_ACEOF |
36162 | user_path!$user_path$ac_delim | ||
36087 | piddir!$piddir$ac_delim | 36163 | piddir!$piddir$ac_delim |
36088 | TEST_SSH_IPV6!$TEST_SSH_IPV6$ac_delim | 36164 | TEST_SSH_IPV6!$TEST_SSH_IPV6$ac_delim |
36089 | TEST_MALLOC_OPTIONS!$TEST_MALLOC_OPTIONS$ac_delim | 36165 | TEST_MALLOC_OPTIONS!$TEST_MALLOC_OPTIONS$ac_delim |
@@ -36092,7 +36168,7 @@ LIBOBJS!$LIBOBJS$ac_delim | |||
36092 | LTLIBOBJS!$LTLIBOBJS$ac_delim | 36168 | LTLIBOBJS!$LTLIBOBJS$ac_delim |
36093 | _ACEOF | 36169 | _ACEOF |
36094 | 36170 | ||
36095 | if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then | 36171 | if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then |
36096 | break | 36172 | break |
36097 | elif $ac_last_try; then | 36173 | elif $ac_last_try; then |
36098 | { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | 36174 | { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |