diff options
| author | Adam Duskett <aduskett@gmail.com> | 2019-05-29 18:33:02 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2019-08-11 17:32:00 +0100 |
| commit | 93a374d18e09d00f903dedee2a3427218691f6b0 (patch) | |
| tree | cbdf43d3aac9638896f79b7379e369f262d0ae0a /ext | |
| parent | a1af0b4f866cedc061c62c3c562f6ab4c72ad032 (diff) | |
| download | gstreamer-plugins-bad-93a374d18e09d00f903dedee2a3427218691f6b0.tar.gz | |
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.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/hls/meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/hls/meson.build b/ext/hls/meson.build index 1f5f58d42..69597ac28 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 |