[MPlayer-cvslog] r38339 - trunk/configure

al subversion at mplayerhq.hu
Thu Feb 24 18:21:17 EET 2022

Author: al
Date: Thu Feb 24 18:21:17 2022
New Revision: 38339

configure: Do not try to detect GnuTLS if OpenSSL was enabled

Enabling GnuTLS via auto detection could have us end up with both
libraries enabled. This won't build anymore. IIRC at some point it
did build, though it was not easy to figure out which implementation
would be used in the end.

This change is done in the light of having no auto detection for
OpenSSL and probably never will, because of the OpenSSL license.


Modified: trunk/configure
--- trunk/configure	Thu Feb 24 16:31:34 2022	(r38338)
+++ trunk/configure	Thu Feb 24 18:21:17 2022	(r38339)
@@ -4703,7 +4703,7 @@ fi
 echocheck "GnuTLS"
 if test "$_gnutls" = auto ; then
-  if $_pkg_config --exists gnutls ; then
+  if $_pkg_config --exists gnutls && test "$_openssl" != "yes" ; then
 	  statement_check gnutls/gnutls.h 'gnutls_global_init()' $($_pkg_config --libs --cflags gnutls) &&

More information about the MPlayer-cvslog mailing list