From a4cfb1fa1475cedd296062c6077d21152d36dc04 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 28 Oct 2018 11:53:42 +0000 Subject: [PATCH] meson: add 'curl-ssh2' option for curl libssh2 support https://bugzilla.gnome.org/show_bug.cgi?id=797346 --- ext/curl/meson.build | 2 +- meson_options.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/curl/meson.build b/ext/curl/meson.build index 124d871..28c523e 100644 --- a/ext/curl/meson.build +++ b/ext/curl/meson.build @@ -15,7 +15,7 @@ curl_sources = [ curl_dep = dependency('libcurl', version : '>= 7.35.0', required : get_option('curl')) if curl_dep.found() - ssh_dep = dependency('libssh2', version : '>= 1.4.3', required : false) + ssh_dep = dependency('libssh2', version : '>= 1.4.3', required : get_option('curl-ssh2')) cdata.set('HAVE_SSH2', ssh_dep.found()) gstcurl = library('gstcurl', diff --git a/meson_options.txt b/meson_options.txt index 14d910f..fbcc453 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -83,6 +83,7 @@ option('bz2', type : 'feature', value : 'auto', description : 'bz2 stream encode option('chromaprint', type : 'feature', value : 'auto', description : 'Chromaprint fingerprint audio plugin') option('closedcaption', type : 'feature', value : 'auto', description : 'Closed caption extractor, decoder, and overlay plugin') option('curl', type : 'feature', value : 'auto', description : 'cURL network source and sink plugin') +option('curl-ssh2', type : 'feature', value : 'auto', description : 'cURL network source and sink plugin libssh2 support') option('d3dvideosink', type : 'feature', value : 'auto', description : 'Direct3D video sink plugin') option('dash', type : 'feature', value : 'auto', description : 'DASH demuxer plugin') option('decklink', type : 'feature', value : 'auto', description : 'DeckLink audio/video source/sink plugin') -- 2.7.4