meson: Make openssl optional, fix build when openssl is disabled

Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
This commit is contained in:
Arnaud Rebillout 2018-10-19 18:00:59 +07:00 committed by Arun Raghavan
parent 911b12c150
commit 1286b798cc
3 changed files with 5 additions and 3 deletions

View file

@ -295,7 +295,7 @@ if lirc_dep.found()
cdata.set('HAVE_LIRC', 1)
endif
openssl_dep = dependency('openssl', version : '>= 0.9', required : false)
openssl_dep = dependency('openssl', version : '>= 0.9', required : get_option('openssl'))
if openssl_dep.found()
cdata.set('HAVE_OPENSSL', 1)
endif

View file

@ -44,6 +44,9 @@ option('jack',
option('lirc',
type : 'feature', value : 'auto',
description : 'Optional LIRC support')
option('openssl',
type : 'feature', value : 'auto',
description : 'Optional OpenSSL support (used for Airtunes/RAOP)')
option('systemd',
type : 'feature', value : 'auto',
description : 'Optional systemd support')

View file

@ -1,6 +1,4 @@
# Order matters! raop needs rtp!
subdir('rtp')
subdir('raop')
# module name, sources, [headers, extra flags, extra deps, extra libs]
all_modules = [
@ -159,6 +157,7 @@ if lirc_dep.found()
endif
if openssl_dep.found()
subdir('raop')
all_modules += [
[ 'module-raop-sink', 'raop/module-raop-sink.c', [], [], [], libraop ],
]