Re: [PATCH] configure: Do not try to detect GnuTLS if OpenSSL was enabled
Alexander Strasser <[email protected]> Thu, 24 Feb 2022 21:43:17 +0100
| Newsgroups | gmane.comp.video.mplayer.devel |
|---|---|
| Message-ID | <[email protected]> |
On 2020-08-23 15:01 +0200, Alexander Strasser wrote: > 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. > --- > > Moved the check into the inner if, because otherwise the result > of the _gnutls would be auto instead of no in case of _openssl > being yes. > > Thanks Reimar for pointing this out. > > I intend to commit the patch next weekend. Committed as r38339 Finally. > configure | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configure b/configure > index dab7c8b8f..f2f66ffde 100755 > --- a/configure > +++ b/configure > @@ -4533,7 +4533,7 @@ fi > echocheck "GnuTLS" > if test "$_gnutls" = auto ; then > _gnutls=no > - 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) && > _gnutls=yes > fi