diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2015-08-06 10:24:34 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2015-08-09 09:20:22 +0000 |
| commit | 83cfec7aacc4c15fb18680165ca60a6754681af1 (patch) | |
| tree | e5222042b92aacfbc26bf6cfd6488b676492f394 /configure | |
| parent | 5bfac9d653357c906946563b9494d7ae69cdad92 (diff) | |
Make SecureTransport the default SSL backend on OS X
SecureTransport is now the default SSL backend on OS X.
Users can still choose the OpenSSL backend by passing the -openssl,
-openssl-linked or -no-securetransport option to configure script.
[ChangeLog][Important Behavior Change] Make SecureTransport the default SSL backend on OS X
Change-Id: I7a4edfdb72e63975d6b31435969702f8e86a10f2
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 17 |
1 files changed, 11 insertions, 6 deletions
@@ -2723,7 +2723,10 @@ MacOS/iOS options: link tools against those frameworks. -no-framework ...... Do not build Qt as a series of frameworks. - -securetransport ... Use SecureTransport instead of OpenSSL (requires -no-openssl) + * -securetransport ... Use SecureTransport instead of OpenSSL + + -no-securetransport Do not use SecureTransport, either use OpenSSL or dot not use any SSL backend + at all (if combined with -no-openssl). -sdk <sdk> ......... Build Qt using Apple provided SDK <sdk>. The argument should be one of the available SDKs as listed by 'xcodebuild -showsdks'. @@ -5932,6 +5935,13 @@ if compileTest unix/cloexec "cloexec"; then CFG_CLOEXEC=yes fi +if [ "$XPLATFORM_MAC" = "yes" ] && [ "$CFG_SECURETRANSPORT" != "no" ] && ([ "$CFG_OPENSSL" = "no" ] || [ "$CFG_OPENSSL" = "auto" ]); then + CFG_SECURETRANSPORT=yes + CFG_OPENSSL=no +else + CFG_SECURETRANSPORT=no +fi + # detect OpenSSL if [ "$CFG_OPENSSL" != "no" ]; then if compileTest unix/openssl "OpenSSL"; then @@ -5951,11 +5961,6 @@ if [ "$CFG_OPENSSL" != "no" ]; then fi fi -if [ "$CFG_SECURETRANSPORT" != "no" ] && [ "$CFG_OPENSSL" = "no" ] && [ "$XPLATFORM_MAC" = "yes" ]; then - CFG_SECURETRANSPORT=yes -else - CFG_SECURETRANSPORT=no -fi # detect PCRE if [ "$CFG_PCRE" != "qt" ]; then |