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

Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>

diff --git a/meson.build b/meson.build
index c32fe2a28fd0b8725067ce11ab74d7f860366d87..ee3afa765f1250f4a9d9a71a574cc273ca2dc84a 100644 (file)
--- 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 5f308b949460f5dad4eb85cd8122143450863738..f2adb993dd0df4651030a21200197aee61421463 100644 (file)
--- 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 6312998396762e29396ab4760dc5a51f46ff8f7f..da528a92720ea8abdc823541089bd3e9f4100459 100644 (file)
--- 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 ],
   ]