diff options
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | meson.build | 14 | ||||
| -rw-r--r-- | meson_options.txt | 3 |
3 files changed, 10 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e68b2e0..57768bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,7 +50,6 @@ makecheck_simple-meson: -Dlz4=false -Dgstaudio=false -Dgstvideo=false - -Dwebdav=false -Dsasl=false -Dpulse=false -Dsmartcard=false diff --git a/meson.build b/meson.build index 63c36a7..ad07421 100644 --- a/meson.build +++ b/meson.build @@ -141,11 +141,15 @@ endif # webdav spice_gtk_has_phodav = false -if get_option('webdav') - spice_glib_deps += dependency('libphodav-2.0') - spice_glib_deps += dependency('libsoup-2.4', version : '>= 2.49.91') - spice_gtk_config_data.set('USE_PHODAV', '1') - spice_gtk_has_phodav = true +d = dependency('libphodav-2.0', required: get_option('webdav')) +if d.found() + spice_glib_deps += d + d = dependency('libsoup-2.4', version : '>= 2.49.91', required: get_option('webdav')) + if d.found() + spice_glib_deps += d + spice_gtk_config_data.set('USE_PHODAV', '1') + spice_gtk_has_phodav = true + endif endif # pulse diff --git a/meson_options.txt b/meson_options.txt index c90e9ca..ba43467 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,8 +3,7 @@ option('gtk', description: 'Enable gtk+') option('webdav', - type : 'boolean', - value : true, + type : 'feature', description: 'Enable webdav support') option('pulse', |