diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-07-01 12:27:46 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-07-01 16:59:24 +0400 |
| commit | 3653d8d9e648f40c4ffbf9db15063527cbb12391 (patch) | |
| tree | db094f0d9ad95bde9dc0ba30339d3b9f332be45f | |
| parent | b296ddbf4b497c5e27d4704df3aed9dd9fb961b2 (diff) | |
build-sys: build against phodav-3.0/soup-3.0 if possible
Prefer libsoup 3.0 over 2.0, when available.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
| -rw-r--r-- | meson.build | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 00aff30..dd46294 100644 --- a/meson.build +++ b/meson.build @@ -184,11 +184,17 @@ endif # webdav spice_gtk_has_phodav = false -phodav_dep = dependency('libphodav-2.0', required: get_option('webdav')) -summary_info += {'webdav': phodav_dep.found()} +phodav_dep = dependency('libphodav-3.0', required: false) +if not phodav_dep.found() + phodav_dep = dependency('libphodav-2.0', required: get_option('webdav')) +endif if phodav_dep.found() spice_glib_deps += phodav_dep - d = dependency('libsoup-2.4', version : '>= 2.49.91', required: get_option('webdav')) + if phodav_dep.name() == 'libphodav-3.0' + d = dependency('libsoup-3.0', version : '>= 3.0', required: get_option('webdav')) + else + d = dependency('libsoup-2.4', version : '>= 2.49.91', required: get_option('webdav')) + endif if d.found() spice_glib_deps += d spice_gtk_config_data.set('USE_PHODAV', '1') @@ -198,6 +204,7 @@ if phodav_dep.found() endif endif endif +summary_info += {'webdav': spice_gtk_has_phodav} gstreamer_version = '1.10' gstreamer_version_info = '>= @0@'.format(gstreamer_version) |