aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2018-03-17 16:49:15 -0300
committerJames Almer <jamrial@gmail.com>2018-03-17 16:49:15 -0300
commitc51dbc2717203e60788fcb0f711a78b15c76a057 (patch)
tree5a757929964e0e5400ef1652bf667be6f6c3c182 /configure
parent222d4b0accaafde79a1aa61b7227d1af1d2a1695 (diff)
downloadffmpeg-c51dbc2717203e60788fcb0f711a78b15c76a057.tar.gz
configure: revert changes to the schannel check
check_cpp_condition was not being called on some targets, which made schannel remain enabled even when it was not available Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index 97767f47db..f09f48c54b 100755
--- a/configure
+++ b/configure
@@ -6126,7 +6126,9 @@ enabled securetransport &&
enabled schannel &&
check_func_headers "windows.h security.h" InitializeSecurityContext -DSECURITY_WIN32 -lsecur32 &&
- check_cpp_condition schannel winerror.h "defined(SEC_I_CONTEXT_EXPIRED)" && schannel_extralibs="-lsecur32"
+ test_cpp_condition winerror.h "defined(SEC_I_CONTEXT_EXPIRED)" &&
+ schannel_extralibs="-lsecur32" ||
+ disable schannel
makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo
enabled makeinfo \