[FFmpeg-cvslog] configure: revert changes to the schannel check
James Almer
git at videolan.org
Sat Mar 17 21:56:55 EET 2018
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Mar 17 16:49:15 2018 -0300| [c51dbc2717203e60788fcb0f711a78b15c76a057] | committer: James Almer
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 at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c51dbc2717203e60788fcb0f711a78b15c76a057
---
configure | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 \
More information about the ffmpeg-cvslog
mailing list