Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-02-22 12:45:35 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-03-09 09:42:24 (GMT) |
| commit | b6254293cc57d90942ed63fcfe5b2be8076b284a (patch) | |
| tree | e49f753f08a90c15a4ab4ca8c37e50ed25813598 /Swiften/FileTransfer | |
| parent | 773809781e97e9814e46855fe57d270c28626843 (diff) | |
| download | swift-b6254293cc57d90942ed63fcfe5b2be8076b284a.zip swift-b6254293cc57d90942ed63fcfe5b2be8076b284a.tar.bz2 | |
Fix using external OpenSSL on Mac OS X
This commit changes our TLS backend configuration behavior.
It introduces the tls_backend Scons argument, which defaults
to the native backend, but can also explicitly set to
'openssl' to use a project external OpenSSL installation or
'openssl_bundled' to build and configure with the OpenSSL
source in the 3rdParty directory.
Test-Information:
Tested on OS X 10.11.3.
./scons ends up using Secure Transport.
./scons tls_backend=openssl \
openssl_include=/usr/local/opt/openssl/include \
openssl_libdir=/usr/local/opt/openssl/lib \
openssl=/usr/local/opt/openssl successfully builds with
openssl from Homebrew.
./scons tls_backend=openssl_bundled successfully builds with
OpenSSL in 3rdParty.
Change-Id: I4fb0ef9d197609afe793554f86e54fe67fc1cab5
Diffstat (limited to 'Swiften/FileTransfer')
0 files changed, 0 insertions, 0 deletions