diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-07-28 13:22:40 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-09-02 16:14:15 +0200 |
| commit | 72655616d9d1c92fac2af48c67bcdcd2b989bcf2 (patch) | |
| tree | 8f9c28300717ba00bc13f2ee936512ac94c93228 | |
| parent | 1c08ff08adc479cd37ca67b8285b0479cbac73b9 (diff) | |
| download | ffmpeg-72655616d9d1c92fac2af48c67bcdcd2b989bcf2.tar.gz | |
build: treat securetransport and schannel like other autodetected libraries
| -rwxr-xr-x | configure | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -3606,6 +3606,7 @@ enable_weak cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder enable_weak zlib bzlib lzma enable_weak iconv +enable_weak securetransport schannel disabled logging && logfile=/dev/null @@ -6055,11 +6056,16 @@ if enabled decklink; then esac fi -disabled securetransport || { check_func SecIdentityCreate "-Wl,-framework,CoreFoundation -Wl,-framework,Security" && - check_lib securetransport "Security/SecureTransport.h Security/Security.h" "SSLCreateContext SecItemImport" "-Wl,-framework,CoreFoundation -Wl,-framework,Security"; } +enabled securetransport && + check_func SecIdentityCreate "-Wl,-framework,CoreFoundation -Wl,-framework,Security" && + check_lib securetransport "Security/SecureTransport.h Security/Security.h" "SSLCreateContext SecItemImport" "-Wl,-framework,CoreFoundation -Wl,-framework,Security" || + disable securetransport -disabled schannel || { check_func_headers "windows.h security.h" InitializeSecurityContext -DSECURITY_WIN32 -lsecur32 && - check_cpp_condition winerror.h "defined(SEC_I_CONTEXT_EXPIRED)" && enable schannel && add_extralibs -lsecur32; } +enabled schannel && + check_func_headers "windows.h security.h" InitializeSecurityContext -DSECURITY_WIN32 -lsecur32 && + check_cpp_condition winerror.h "defined(SEC_I_CONTEXT_EXPIRED)" && + add_extralibs -lsecur32 || + disable schannel makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo enabled makeinfo \ |