diff mbox series

[FFmpeg-devel] configure: account for openssl3 license change

Message ID 20210907184418.3326-1-timo@rothenpieler.org
State Accepted
Commit 1d23e125b6f76e74b754560c3b6931507cacddce
Headers show
Series [FFmpeg-devel] configure: account for openssl3 license change | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Timo Rothenpieler Sept. 7, 2021, 6:44 p.m. UTC 
---
 configure | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Timo Rothenpieler Sept. 13, 2021, 7:10 p.m. UTC | #1 
will push this soon
diff mbox series

Patch

diff --git a/configure b/configure
index af410a9d11..d595655325 100755
--- a/configure
+++ b/configure
@@ -1765,7 +1765,6 @@  EXTERNAL_LIBRARY_GPL_LIST="
 EXTERNAL_LIBRARY_NONFREE_LIST="
     decklink
     libfdk_aac
-    openssl
     libtls
 "
 
@@ -1857,6 +1856,7 @@  EXTERNAL_LIBRARY_LIST="
     mediacodec
     openal
     opengl
+    openssl
     pocketsphinx
     vapoursynth
 "
@@ -6574,7 +6574,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 ||