From: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
---
.gitlab-ci.yml | 1 -
meson.build | 8 +++-----
meson_options.txt | 3 +--
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e913da4..fabe29e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,6 @@ makecheck_simple-meson:
- meson build -Dauto_features=disabled
-Dlz4=false
-Dsasl=false
- -Dpulse=false
-Dsmartcard=false
-Dusbredir=false
-Ddbus=false || (cat build/meson-logs/meson-log.txt && exit 1)
diff --git a/meson.build b/meson.build
index 9bb56c3..69f7e1f 100644
--- a/meson.build
+++ b/meson.build
@@ -154,11 +154,9 @@ endif
# pulse
spice_gtk_has_pulse = false
-if get_option('pulse')
- deps = ['libpulse', 'libpulse-mainloop-glib']
- foreach dep : deps
- spice_glib_deps += dependency(dep)
- endforeach
+d = dependency('libpulse-mainloop-glib', required: get_option('pulse'))
+if d.found()
+ spice_glib_deps += d
spice_gtk_config_data.set('HAVE_PULSE', '1')
spice_gtk_has_pulse = true
endif
diff --git a/meson_options.txt b/meson_options.txt
index 3f1da89..404026d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,8 +7,7 @@ option('webdav',
description: 'Enable webdav support')
option('pulse',
- type : 'boolean',
- value : true,
+ type : 'feature',
description: 'Enable the PulseAudio backend')
option('builtin-mjpeg',
--
2.20.1.2.gb21ebb671b
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel