[FFmpeg-cvslog] configure: Bail out if both GnuTLS and OpenSSL are enabled

Diego Biurrun git at videolan.org
Wed Nov 1 23:46:03 EET 2017


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri May 26 13:05:12 2017 +0200| [ed434be106a4615e0419b3ac7664220741afda2d] | committer: Diego Biurrun

configure: Bail out if both GnuTLS and OpenSSL are enabled

Both libraries provide similar functionality and cannot be used together.
When both are enabled one is used and the other ignored arbitrarily. Error
out instead and have the user choose which library to use.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed434be106a4615e0419b3ac7664220741afda2d
---

 configure | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure b/configure
index cf10e54a89..0281f54505 100755
--- a/configure
+++ b/configure
@@ -2887,6 +2887,9 @@ map "die_license_disabled version3" $EXTERNAL_LIBRARY_VERSION3_LIST
 
 enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
 
+enabled_all gnutls openssl &&
+    die "GnuTLS and OpenSSL must not be enabled at the same time."
+
 # Disable all the library-specific components if the library itself
 # is disabled, see AVCODEC_LIST and following _LIST variables.
 



More information about the ffmpeg-cvslog mailing list