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

diff --git a/ext/curl/meson.build b/ext/curl/meson.build
index aa285b0..a889e6e 100644 (file)
--- a/ext/curl/meson.build
+++ b/ext/curl/meson.build
@@ -15,6 +15,9 @@ curl_sources = [
 curl_dep = dependency('libcurl', version : '>= 7.35.0', required : false)
 
 if curl_dep.found()
+  ssh_dep = dependency('libssh2', version : '>= 1.4.3', required : false)
+  cdata.set('HAVE_SSH2', ssh_dep.found())
+
   gstcurl = library('gstcurl',
     curl_sources,
     c_args : gst_plugins_bad_args,

diff --git a/meson.build b/meson.build
index 4d57ccb..673c7e0 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -436,8 +436,6 @@ else
     endif
 endif
 
-configure_file(output : 'config.h', configuration : cdata)
-
 gst_plugins_bad_args = ['-DHAVE_CONFIG_H']
 configinc = include_directories('.')
 libsinc = include_directories('gst-libs')
@@ -462,6 +460,8 @@ subdir('ext')
 subdir('tests')
 subdir('pkgconfig')
 
+configure_file(output : 'config.h', configuration : cdata)
+
 # xgettext is optional (on Windows for instance)
 if find_program('xgettext', required : false).found()
   subdir('po')