diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rwxr-xr-x | tests/runtests.pl | 24 |
2 files changed, 18 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index d77cfe0ad..18c77fb55 100644 --- a/configure.ac +++ b/configure.ac @@ -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 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 # SSL is enabled, genericly AC_SUBST(SSL_ENABLED) diff --git a/tests/runtests.pl b/tests/runtests.pl index b39da66d0..4915f2e81 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -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_metalink;# set if curl is built with Metalink support -my $has_openssl; # built with a lib using an OpenSSL-like API -my $has_gnutls; # built with GnuTLS -my $has_nss; # built with NSS -my $has_yassl; # built with yassl -my $has_polarssl;# built with polarssl -my $has_axtls; # built with axTLS -my $has_winssl; # built with WinSSL (Schannel/SSPI) +my $has_openssl; # built with a lib using an OpenSSL-like API +my $has_gnutls; # built with GnuTLS +my $has_nss; # built with NSS +my $has_yassl; # built with yassl +my $has_polarssl; # built with polarssl +my $has_axtls; # built with axTLS +my $has_winssl; # built with WinSSL (Schannel/SSPI) +my $has_darwinssl;# build with DarwinSSL (Secure Transport) my $has_shared = "unknown"; # built shared @@ -2258,6 +2259,10 @@ sub checksystem { $has_axtls=1; $ssllib="axTLS"; } + elsif ($libcurl =~ /securetransport/i) { + $has_darwinssl=1; + $ssllib="DarwinSSL"; + } } elsif($_ =~ /^Protocols: (.*)/i) { # these are the protocols compiled in to this libcurl @@ -2682,6 +2687,11 @@ sub singletest { next; } } + elsif($f eq "DarwinSSL") { + if($has_darwinssl) { + next; + } + } elsif($f eq "unittest") { if($debug_build) { next; |