From 1286b798ccc13c6ff29ca332c7373f6d2de3fc84 Mon Sep 17 00:00:00 2001 From: Arnaud Rebillout Date: Fri, 19 Oct 2018 18:00:59 +0700 Subject: [PATCH] meson: Make openssl optional, fix build when openssl is disabled Signed-off-by: Arnaud Rebillout --- meson.build | 2 +- meson_options.txt | 3 +++ src/modules/meson.build | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index c32fe2a28..ee3afa765 100644 --- a/meson.build +++ b/meson.build @@ -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 diff --git a/meson_options.txt b/meson_options.txt index 5f308b949..f2adb993d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -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') diff --git a/src/modules/meson.build b/src/modules/meson.build index 631299839..da528a927 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -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 ], ]