44 lines
1.9 KiB
Diff
44 lines
1.9 KiB
Diff
From 1d23e125b6f76e74b754560c3b6931507cacddce Mon Sep 17 00:00:00 2001
|
|
From: Timo Rothenpieler <timo@rothenpieler.org>
|
|
Date: Tue, 7 Sep 2021 19:35:31 +0200
|
|
Subject: [PATCH] configure: account for openssl3 license change
|
|
|
|
---
|
|
configure | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index c87a010387..ed7345b2c1 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
|
|
"
|
|
@@ -6572,7 +6572,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 ||
|
|
--
|
|
2.34.1
|
|
|