mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

meosn: curl: also check for and use libssh2 if available

Browse source
This commit is contained in:
Tim-Philipp Müller 2018-01-22 18:53:22 +00:00
parent b691700f5e
commit cfe030ad1b
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ext/curl/meson.build
View file

@ -15,6 +15,9 @@ curl_sources = [
curl_dep = dependency('libcurl', version : '>= 7.35.0', required : false) curl_dep = dependency('libcurl', version : '>= 7.35.0', required : false)
if curl_dep.found() if curl_dep.found()
ssh_dep = dependency('libssh2', version : '>= 1.4.3', required : false)
cdata.set('HAVE_SSH2', ssh_dep.found())
gstcurl = library('gstcurl', gstcurl = library('gstcurl',
curl_sources, curl_sources,
c_args : gst_plugins_bad_args, c_args : gst_plugins_bad_args,

4
meson.build
View file

@ -436,8 +436,6 @@ else
endif endif
endif endif
configure_file(output : 'config.h', configuration : cdata)
gst_plugins_bad_args = ['-DHAVE_CONFIG_H'] gst_plugins_bad_args = ['-DHAVE_CONFIG_H']
configinc = include_directories('.') configinc = include_directories('.')
libsinc = include_directories('gst-libs') libsinc = include_directories('gst-libs')
@ -462,6 +460,8 @@ subdir('ext')
subdir('tests') subdir('tests')
subdir('pkgconfig') subdir('pkgconfig')
configure_file(output : 'config.h', configuration : cdata)
# xgettext is optional (on Windows for instance) # xgettext is optional (on Windows for instance)
if find_program('xgettext', required : false).found() if find_program('xgettext', required : false).found()
subdir('po') subdir('po')