[libvirt PATCH 058/351] meson: add libssh build dependency

[Pavel Hrdina]

On Wed, Jul 22, 2020 at 10:56:45AM +0200, Peter Krempa wrote:
> On Thu, Jul 16, 2020 at 11:54:54 +0200, Pavel Hrdina wrote:
> > Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
> > ---
> >  configure.ac      |  4 ----
> >  m4/virt-libssh.m4 | 51 -----------------------------------------------
> >  meson.build       | 22 ++++++++++++++++++++
> >  meson_options.txt |  1 +
> >  4 files changed, 23 insertions(+), 55 deletions(-)
> >  delete mode 100644 m4/virt-libssh.m4
> 
> 
> 
> > diff --git a/meson.build b/meson.build
> > index 2346ae31d5a..2ab3aa87dea 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -1111,6 +1111,27 @@ if libpcap_dep.found()
> >    conf.set('HAVE_LIBPCAP', 1)
> >  endif
> >  
> > +libssh_version = '0.7'
> > +if get_option('driver_remote').enabled()
> > +  libssh_dep = dependency('libssh', version: '>=' + libssh_version, required: get_option('libssh'))
> > +  if libssh_dep.found()
> > +    conf.set('WITH_LIBSSH', 1)
> > +
> > +    functions = [
> > +      [ 'ssh_get_server_publickey', 'ssh_get_publickey' ],
> > +      [ 'ssh_session_is_known_server', 'ssh_is_server_known' ],
> > +      [ 'ssh_session_update_known_hosts', 'ssh_write_knownhost' ],
> 
> IMO using a dictionary here would be great for clarity to see which are
> the old and which are the new symbols. Or at least a comment similarly
> to what we had before.

Dictionary would be to verbose so I'll go with comment.
Good point, thanks.

Pavel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20200722/3953ff8f/attachment-0001.sig>