diff options
author | Matt Oliver <protogonoi@gmail.com> | 2016-10-10 06:49:54 +1100 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2016-10-23 22:02:08 +0300 |
commit | ee050797664c7c74cae262ffab05006b55d47a11 (patch) | |
tree | fe8d7d53efb856fd6c58d2a978aaf037411f5da5 /configure | |
parent | 016387fe0fe3eff1a03ec0673bf4d2967f6cad94 (diff) | |
download | ffmpeg-streaming-ee050797664c7c74cae262ffab05006b55d47a11.zip ffmpeg-streaming-ee050797664c7c74cae262ffab05006b55d47a11.tar.gz |
openssl: Support version 1.1.0.
Further simplifications by Martin Storsjö, to minimize the
diff.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -4689,7 +4689,8 @@ enabled omx && { check_header OMX_Core.h || add_cflags -isystem/opt/vc/include/IL ; } check_header OMX_Core.h ; } || die "ERROR: OpenMAX IL headers not found"; } -enabled openssl && { check_pkg_config openssl openssl/ssl.h SSL_library_init && { +enabled openssl && { { check_pkg_config openssl openssl/ssl.h OPENSSL_init_ssl || + check_pkg_config openssl openssl/ssl.h SSL_library_init; } && { add_cflags $openssl_cflags && add_extralibs $openssl_libs; }|| check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto || check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 || |