From: Adam Duskett <aduskett@gmail.com>
Date: Wed, 29 May 2019 18:33:02 +0000 (+0000)
Subject: ext/hls/meson.build: fix dependency logic
X-Git-Tag: 1.19.3~507^2~3318
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=43eaf5ac4a08b27f08c9be476e15aa6c64848a4b;p=platform%2Fupstream%2Fgstreamer.git

ext/hls/meson.build: fix dependency logic

Currently, if one was to set -Dhls-crypto to either libgcrypt or openssl
instead of auto, the following lines would fail because hls_crypto_dep is not
yet set:

if not hls_crypto_dep.found() and ['auto', 'libgcrypt'].contains(hls_crypto)
if not hls_crypto_dep.found() and ['auto', 'openssl'].contains(hls_crypto)

Instead, change "if not hls_crypto_dep.found()" to "if not have_hls_crypto"
which fixes the error.
---

diff --git a/ext/hls/meson.build b/ext/hls/meson.build
index fb5a7d4..0d33327 100644
--- a/ext/hls/meson.build
+++ b/ext/hls/meson.build
@@ -23,7 +23,7 @@ if not hls_option.disabled()
     endif
   endif
 
-  if not hls_crypto_dep.found() and ['auto', 'libgcrypt'].contains(hls_crypto)
+  if not have_hls_crypto and ['auto', 'libgcrypt'].contains(hls_crypto)
     hls_crypto_dep = cc.find_library('gcrypt', required : false)
     if hls_crypto_dep.found()
       have_hls_crypto = true
@@ -31,7 +31,7 @@ if not hls_option.disabled()
     endif
   endif
 
-  if not hls_crypto_dep.found() and ['auto', 'openssl'].contains(hls_crypto)
+  if not have_hls_crypto and ['auto', 'openssl'].contains(hls_crypto)
     hls_crypto_dep = dependency('openssl', required : false)
     if hls_crypto_dep.found()
       have_hls_crypto = true