darwinssl: fix undefined $ssllib warning in runtests.pl
I also added --with-darwinssl to the list of SSL options in configure.
This commit is contained in:
Родитель
d23d2f2bd8
Коммит
cc27aff7b3
|
@ -2293,7 +2293,7 @@ fi
|
||||||
|
|
||||||
if test "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED$POLARSSL_ENABLED$AXTLS_ENABLED$CYASSL_ENABLED$WINSSL_ENABLED$DARWINSSL_ENABLED" = "x"; then
|
if test "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED$POLARSSL_ENABLED$AXTLS_ENABLED$CYASSL_ENABLED$WINSSL_ENABLED$DARWINSSL_ENABLED" = "x"; then
|
||||||
AC_MSG_WARN([SSL disabled, you will not be able to use HTTPS, FTPS, NTLM and more.])
|
AC_MSG_WARN([SSL disabled, you will not be able to use HTTPS, FTPS, NTLM and more.])
|
||||||
AC_MSG_WARN([Use --with-ssl, --with-gnutls, --with-polarssl, --with-cyassl, --with-nss, --with-axtls or --with-winssl to address this.])
|
AC_MSG_WARN([Use --with-ssl, --with-gnutls, --with-polarssl, --with-cyassl, --with-nss, --with-axtls, --with-winssl, or --with-darwinssl to address this.])
|
||||||
else
|
else
|
||||||
# SSL is enabled, genericly
|
# SSL is enabled, genericly
|
||||||
AC_SUBST(SSL_ENABLED)
|
AC_SUBST(SSL_ENABLED)
|
||||||
|
|
|
@ -213,13 +213,14 @@ my $has_charconv;# set if libcurl is built with CharConv support
|
||||||
my $has_tls_srp; # set if libcurl is built with TLS-SRP support
|
my $has_tls_srp; # set if libcurl is built with TLS-SRP support
|
||||||
my $has_metalink;# set if curl is built with Metalink support
|
my $has_metalink;# set if curl is built with Metalink support
|
||||||
|
|
||||||
my $has_openssl; # built with a lib using an OpenSSL-like API
|
my $has_openssl; # built with a lib using an OpenSSL-like API
|
||||||
my $has_gnutls; # built with GnuTLS
|
my $has_gnutls; # built with GnuTLS
|
||||||
my $has_nss; # built with NSS
|
my $has_nss; # built with NSS
|
||||||
my $has_yassl; # built with yassl
|
my $has_yassl; # built with yassl
|
||||||
my $has_polarssl;# built with polarssl
|
my $has_polarssl; # built with polarssl
|
||||||
my $has_axtls; # built with axTLS
|
my $has_axtls; # built with axTLS
|
||||||
my $has_winssl; # built with WinSSL (Schannel/SSPI)
|
my $has_winssl; # built with WinSSL (Schannel/SSPI)
|
||||||
|
my $has_darwinssl;# build with DarwinSSL (Secure Transport)
|
||||||
|
|
||||||
my $has_shared = "unknown"; # built shared
|
my $has_shared = "unknown"; # built shared
|
||||||
|
|
||||||
|
@ -2258,6 +2259,10 @@ sub checksystem {
|
||||||
$has_axtls=1;
|
$has_axtls=1;
|
||||||
$ssllib="axTLS";
|
$ssllib="axTLS";
|
||||||
}
|
}
|
||||||
|
elsif ($libcurl =~ /securetransport/i) {
|
||||||
|
$has_darwinssl=1;
|
||||||
|
$ssllib="DarwinSSL";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
elsif($_ =~ /^Protocols: (.*)/i) {
|
elsif($_ =~ /^Protocols: (.*)/i) {
|
||||||
# these are the protocols compiled in to this libcurl
|
# these are the protocols compiled in to this libcurl
|
||||||
|
@ -2682,6 +2687,11 @@ sub singletest {
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
elsif($f eq "DarwinSSL") {
|
||||||
|
if($has_darwinssl) {
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
}
|
||||||
elsif($f eq "unittest") {
|
elsif($f eq "unittest") {
|
||||||
if($debug_build) {
|
if($debug_build) {
|
||||||
next;
|
next;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче