diff options
| author | Timo Rothenpieler <timo@rothenpieler.org> | 2021-09-07 19:35:31 +0200 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2023-05-01 10:54:08 +0200 |
| commit | a66ee3abd228fca77828a1a97f0b90fbaf4d8383 (patch) | |
| tree | a4e5e3f072dbfa9ff6c69334ff527a977f76a030 | |
| parent | 71fb6132637a2a430375c24afc381fff8b854fe7 (diff) | |
| download | ffmpeg-a66ee3abd228fca77828a1a97f0b90fbaf4d8383.tar.gz | |
configure: account for openssl3 license change
| -rwxr-xr-x | configure | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1735,7 +1735,6 @@ EXTERNAL_LIBRARY_GPL_LIST=" EXTERNAL_LIBRARY_NONFREE_LIST=" decklink libfdk_aac - openssl libtls " @@ -1827,6 +1826,7 @@ EXTERNAL_LIBRARY_LIST=" mediacodec openal opengl + openssl pocketsphinx vapoursynth " @@ -6531,7 +6531,10 @@ enabled omx_rpi && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoR die "ERROR: OpenMAX IL headers from raspberrypi/firmware not found"; } && enable omx enabled omx && require_headers OMX_Core.h -enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl || +enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0" openssl/ssl.h OPENSSL_init_ssl && + { enabled gplv3 || ! enabled gpl || enabled nonfree || die "ERROR: OpenSSL >=3.0.0 requires --enable-version3"; }; } || + { enabled gpl && ! enabled nonfree && die "ERROR: OpenSSL <3.0.0 is incompatible with the gpl"; } || + check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl || check_pkg_config openssl openssl openssl/ssl.h SSL_library_init || check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto || check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto || |