summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-10-07 12:13:50 +0100
committerColin Watson <cjwatson@debian.org>2014-10-07 12:13:50 +0100
commit487bdb3a5ef6075887b830ccb8a0b14f6da78e93 (patch)
treea2cff6fec1e6c4b4153a170a3e172cfe6bfdec46 /configure
parent796ba4fd011b5d0d9d78d592ba2f30fc9d5ed2e7 (diff)
parent28453d58058a4d60c3ebe7d7f0c31a510cbf6158 (diff)
Import openssh_6.7p1.orig.tar.gz
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure193
1 files changed, 93 insertions, 100 deletions
diff --git a/configure b/configure
index d690393a3..6815388cc 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
1#! /bin/sh 1#! /bin/sh
2# From configure.ac Revision: 1.571 . 2# From configure.ac Revision: 1.583 .
3# Guess values for system-dependent variables and create Makefiles. 3# Guess values for system-dependent variables and create Makefiles.
4# Generated by GNU Autoconf 2.68 for OpenSSH Portable. 4# Generated by GNU Autoconf 2.68 for OpenSSH Portable.
5# 5#
@@ -725,7 +725,6 @@ with_osfsia
725with_zlib 725with_zlib
726with_zlib_version_check 726with_zlib_version_check
727with_skey 727with_skey
728with_tcp_wrappers
729with_ldns 728with_ldns
730with_libedit 729with_libedit
731with_audit 730with_audit
@@ -1417,7 +1416,6 @@ Optional Packages:
1417 --with-zlib=PATH Use zlib in PATH 1416 --with-zlib=PATH Use zlib in PATH
1418 --without-zlib-version-check Disable zlib version check 1417 --without-zlib-version-check Disable zlib version check
1419 --with-skey[=PATH] Enable S/Key support (optionally in PATH) 1418 --with-skey[=PATH] Enable S/Key support (optionally in PATH)
1420 --with-tcp-wrappers[=PATH] Enable tcpwrappers support (optionally in PATH)
1421 --with-ldns[=PATH] Use ldns for DNSSEC support (optionally in PATH) 1419 --with-ldns[=PATH] Use ldns for DNSSEC support (optionally in PATH)
1422 --with-libedit[=PATH] Enable libedit support for sftp 1420 --with-libedit[=PATH] Enable libedit support for sftp
1423 --with-audit=module Enable audit support (modules=debug,bsm,linux) 1421 --with-audit=module Enable audit support (modules=debug,bsm,linux)
@@ -9706,84 +9704,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9706fi 9704fi
9707 9705
9708 9706
9709# Check whether user wants TCP wrappers support
9710TCPW_MSG="no"
9711
9712# Check whether --with-tcp-wrappers was given.
9713if test "${with_tcp_wrappers+set}" = set; then :
9714 withval=$with_tcp_wrappers;
9715 if test "x$withval" != "xno" ; then
9716 saved_LIBS="$LIBS"
9717 saved_LDFLAGS="$LDFLAGS"
9718 saved_CPPFLAGS="$CPPFLAGS"
9719 if test -n "${withval}" && \
9720 test "x${withval}" != "xyes"; then
9721 if test -d "${withval}/lib"; then
9722 if test -n "${need_dash_r}"; then
9723 LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
9724 else
9725 LDFLAGS="-L${withval}/lib ${LDFLAGS}"
9726 fi
9727 else
9728 if test -n "${need_dash_r}"; then
9729 LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}"
9730 else
9731 LDFLAGS="-L${withval} ${LDFLAGS}"
9732 fi
9733 fi
9734 if test -d "${withval}/include"; then
9735 CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
9736 else
9737 CPPFLAGS="-I${withval} ${CPPFLAGS}"
9738 fi
9739 fi
9740 LIBS="-lwrap $LIBS"
9741 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwrap" >&5
9742$as_echo_n "checking for libwrap... " >&6; }
9743 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9744/* end confdefs.h. */
9745
9746#include <sys/types.h>
9747#include <sys/socket.h>
9748#include <netinet/in.h>
9749#include <tcpd.h>
9750int deny_severity = 0, allow_severity = 0;
9751
9752int
9753main ()
9754{
9755
9756 hosts_access(0);
9757
9758 ;
9759 return 0;
9760}
9761_ACEOF
9762if ac_fn_c_try_link "$LINENO"; then :
9763
9764 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9765$as_echo "yes" >&6; }
9766
9767$as_echo "#define LIBWRAP 1" >>confdefs.h
9768
9769 SSHDLIBS="$SSHDLIBS -lwrap"
9770 TCPW_MSG="yes"
9771
9772else
9773
9774 as_fn_error $? "*** libwrap missing" "$LINENO" 5
9775
9776
9777fi
9778rm -f core conftest.err conftest.$ac_objext \
9779 conftest$ac_exeext conftest.$ac_ext
9780 LIBS="$saved_LIBS"
9781 fi
9782
9783
9784fi
9785
9786
9787# Check whether user wants to use ldns 9707# Check whether user wants to use ldns
9788LDNS_MSG="no" 9708LDNS_MSG="no"
9789 9709
@@ -10348,10 +10268,6 @@ for ac_func in \
10348 Blowfish_expandstate \ 10268 Blowfish_expandstate \
10349 Blowfish_expand0state \ 10269 Blowfish_expand0state \
10350 Blowfish_stream2word \ 10270 Blowfish_stream2word \
10351 arc4random \
10352 arc4random_buf \
10353 arc4random_stir \
10354 arc4random_uniform \
10355 asprintf \ 10271 asprintf \
10356 b64_ntop \ 10272 b64_ntop \
10357 __b64_ntop \ 10273 __b64_ntop \
@@ -10395,6 +10311,7 @@ for ac_func in \
10395 mblen \ 10311 mblen \
10396 md5_crypt \ 10312 md5_crypt \
10397 memmove \ 10313 memmove \
10314 memset_s \
10398 mkdtemp \ 10315 mkdtemp \
10399 mmap \ 10316 mmap \
10400 ngetaddrinfo \ 10317 ngetaddrinfo \
@@ -10453,7 +10370,6 @@ for ac_func in \
10453 user_from_uid \ 10370 user_from_uid \
10454 usleep \ 10371 usleep \
10455 vasprintf \ 10372 vasprintf \
10456 vhangup \
10457 vsnprintf \ 10373 vsnprintf \
10458 waitpid \ 10374 waitpid \
10459 10375
@@ -11269,11 +11185,9 @@ fi
11269 11185
11270fi 11186fi
11271 11187
11272# If we don't have a working asprintf, then we strongly depend on vsnprintf 11188# We depend on vsnprintf returning the right thing on overflow: the
11273# returning the right thing on overflow: the number of characters it tried to 11189# number of characters it tried to create (as per SUSv3)
11274# create (as per SUSv3) 11190if test "x$ac_cv_func_vsnprintf" = "xyes" ; then
11275if test "x$ac_cv_func_asprintf" != "xyes" && \
11276 test "x$ac_cv_func_vsnprintf" = "xyes" ; then
11277 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether vsnprintf returns correct values on overflow" >&5 11191 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether vsnprintf returns correct values on overflow" >&5
11278$as_echo_n "checking whether vsnprintf returns correct values on overflow... " >&6; } 11192$as_echo_n "checking whether vsnprintf returns correct values on overflow... " >&6; }
11279 if test "$cross_compiling" = yes; then : 11193 if test "$cross_compiling" = yes; then :
@@ -11288,10 +11202,14 @@ else
11288#include <stdio.h> 11202#include <stdio.h>
11289#include <stdarg.h> 11203#include <stdarg.h>
11290 11204
11291int x_snprintf(char *str,size_t count,const char *fmt,...) 11205int x_snprintf(char *str, size_t count, const char *fmt, ...)
11292{ 11206{
11293 size_t ret; va_list ap; 11207 size_t ret;
11294 va_start(ap, fmt); ret = vsnprintf(str, count, fmt, ap); va_end(ap); 11208 va_list ap;
11209
11210 va_start(ap, fmt);
11211 ret = vsnprintf(str, count, fmt, ap);
11212 va_end(ap);
11295 return ret; 11213 return ret;
11296} 11214}
11297 11215
@@ -11299,8 +11217,12 @@ int
11299main () 11217main ()
11300{ 11218{
11301 11219
11302 char x[1]; 11220char x[1];
11303 exit(x_snprintf(x, 1, "%s %d", "hello", 12345) == 11 ? 0 : 1); 11221if (x_snprintf(x, 1, "%s %d", "hello", 12345) != 11)
11222 return 1;
11223if (x_snprintf(NULL, 0, "%s %d", "hello", 12345) != 11)
11224 return 1;
11225return 0;
11304 11226
11305 ; 11227 ;
11306 return 0; 11228 return 0;
@@ -11897,7 +11819,7 @@ main ()
11897 if(fd == NULL) 11819 if(fd == NULL)
11898 exit(1); 11820 exit(1);
11899 11821
11900 if ((rc = fprintf(fd ,"%x (%s)\n", OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT)) <0) 11822 if ((rc = fprintf(fd ,"%08x (%s)\n", OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT)) <0)
11901 exit(1); 11823 exit(1);
11902 11824
11903 exit(0); 11825 exit(0);
@@ -11954,7 +11876,8 @@ main ()
11954 if(fd == NULL) 11876 if(fd == NULL)
11955 exit(1); 11877 exit(1);
11956 11878
11957 if ((rc = fprintf(fd ,"%x (%s)\n", SSLeay(), SSLeay_version(SSLEAY_VERSION))) <0) 11879 if ((rc = fprintf(fd ,"%08x (%s)\n", SSLeay(),
11880 SSLeay_version(SSLEAY_VERSION))) <0)
11958 exit(1); 11881 exit(1);
11959 11882
11960 exit(0); 11883 exit(0);
@@ -11966,6 +11889,13 @@ _ACEOF
11966if ac_fn_c_try_run "$LINENO"; then : 11889if ac_fn_c_try_run "$LINENO"; then :
11967 11890
11968 ssl_library_ver=`cat conftest.ssllibver` 11891 ssl_library_ver=`cat conftest.ssllibver`
11892 # Check version is supported.
11893 case "$ssl_library_ver" in
11894 0090[0-7]*|009080[0-5]*)
11895 as_fn_error $? "OpenSSL >= 0.9.8f required" "$LINENO" 5
11896 ;;
11897 *) ;;
11898 esac
11969 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ssl_library_ver" >&5 11899 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ssl_library_ver" >&5
11970$as_echo "$ssl_library_ver" >&6; } 11900$as_echo "$ssl_library_ver" >&6; }
11971 11901
@@ -11981,6 +11911,18 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
11981fi 11911fi
11982 11912
11983 11913
11914# XXX make --without-openssl work
11915
11916cat >>confdefs.h <<_ACEOF
11917#define WITH_OPENSSL 1
11918_ACEOF
11919
11920
11921cat >>confdefs.h <<_ACEOF
11922#define WITH_SSH1 1
11923_ACEOF
11924
11925
11984 11926
11985# Check whether --with-openssl-header-check was given. 11927# Check whether --with-openssl-header-check was given.
11986if test "${with_openssl_header_check+set}" = set; then : 11928if test "${with_openssl_header_check+set}" = set; then :
@@ -12514,6 +12456,25 @@ else
12514fi 12456fi
12515done 12457done
12516 12458
12459# Search for RIPE-MD support in OpenSSL
12460for ac_func in EVP_ripemd160
12461do :
12462 ac_fn_c_check_func "$LINENO" "EVP_ripemd160" "ac_cv_func_EVP_ripemd160"
12463if test "x$ac_cv_func_EVP_ripemd160" = xyes; then :
12464 cat >>confdefs.h <<_ACEOF
12465#define HAVE_EVP_RIPEMD160 1
12466_ACEOF
12467
12468else
12469 unsupported_algorithms="$unsupported_algorithms \
12470 hmac-ripemd160
12471 hmac-ripemd160@openssh.com
12472 hmac-ripemd160-etm@openssh.com"
12473
12474
12475fi
12476done
12477
12517 12478
12518# Check complete ECC support in OpenSSL 12479# Check complete ECC support in OpenSSL
12519{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL has NID_X9_62_prime256v1" >&5 12480{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL has NID_X9_62_prime256v1" >&5
@@ -12714,6 +12675,24 @@ fi
12714 12675
12715 12676
12716 12677
12678for ac_func in \
12679 arc4random \
12680 arc4random_buf \
12681 arc4random_stir \
12682 arc4random_uniform \
12683
12684do :
12685 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
12686ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
12687if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
12688 cat >>confdefs.h <<_ACEOF
12689#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
12690_ACEOF
12691
12692fi
12693done
12694
12695
12717saved_LIBS="$LIBS" 12696saved_LIBS="$LIBS"
12718{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ia_openinfo in -liaf" >&5 12697{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ia_openinfo in -liaf" >&5
12719$as_echo_n "checking for ia_openinfo in -liaf... " >&6; } 12698$as_echo_n "checking for ia_openinfo in -liaf... " >&6; }
@@ -13123,7 +13102,14 @@ fi
13123rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 13102rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13124fi 13103fi
13125 13104
13126SSH_PRIVSEP_USER=sshd 13105case "$host" in
13106*-*-cygwin*)
13107 SSH_PRIVSEP_USER=CYGWIN_SSH_PRIVSEP_USER
13108 ;;
13109*)
13110 SSH_PRIVSEP_USER=sshd
13111 ;;
13112esac
13127 13113
13128# Check whether --with-privsep-user was given. 13114# Check whether --with-privsep-user was given.
13129if test "${with_privsep_user+set}" = set; then : 13115if test "${with_privsep_user+set}" = set; then :
@@ -13136,11 +13122,19 @@ if test "${with_privsep_user+set}" = set; then :
13136 13122
13137fi 13123fi
13138 13124
13125if test "x$SSH_PRIVSEP_USER" = "xCYGWIN_SSH_PRIVSEP_USER" ; then
13126
13127cat >>confdefs.h <<_ACEOF
13128#define SSH_PRIVSEP_USER CYGWIN_SSH_PRIVSEP_USER
13129_ACEOF
13130
13131else
13139 13132
13140cat >>confdefs.h <<_ACEOF 13133cat >>confdefs.h <<_ACEOF
13141#define SSH_PRIVSEP_USER "$SSH_PRIVSEP_USER" 13134#define SSH_PRIVSEP_USER "$SSH_PRIVSEP_USER"
13142_ACEOF 13135_ACEOF
13143 13136
13137fi
13144 13138
13145 13139
13146if test "x$have_linux_no_new_privs" = "x1" ; then 13140if test "x$have_linux_no_new_privs" = "x1" ; then
@@ -19684,7 +19678,6 @@ echo " KerberosV support: $KRB5_MSG"
19684echo " SELinux support: $SELINUX_MSG" 19678echo " SELinux support: $SELINUX_MSG"
19685echo " Smartcard support: $SCARD_MSG" 19679echo " Smartcard support: $SCARD_MSG"
19686echo " S/KEY support: $SKEY_MSG" 19680echo " S/KEY support: $SKEY_MSG"
19687echo " TCP Wrappers support: $TCPW_MSG"
19688echo " MD5 password support: $MD5_MSG" 19681echo " MD5 password support: $MD5_MSG"
19689echo " libedit support: $LIBEDIT_MSG" 19682echo " libedit support: $LIBEDIT_MSG"
19690echo " Solaris process contract support: $SPC_MSG" 19683echo " Solaris process contract support: $SPC_MSG"