On Tue, Jun 08, 2021 at 01:22:44PM +0200, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
> ---
> configure | 35 ++++-------------------------------
> meson.build | 22 ++++++++++++++++------
> meson_options.txt | 2 ++
> 3 files changed, 22 insertions(+), 37 deletions(-)
Reviewed-by: Daniel P. Berrangé <berra...@redhat.com>
> @@ -871,14 +872,22 @@ if not get_option('gtk').auto() or (have_system and not
> cocoa.found())
> required: false,
> kwargs: static_kwargs)
> gtk = declare_dependency(dependencies: [gtk, gtkx11])
> +
> + if not get_option('vte').auto() or have_system
> + vte = dependency('vte-2.91', version: '>=0.32.0',
> + method: 'pkg-config',
> + required: get_option('vte'),
> + kwargs: static_kwargs)
> + if not vte.found()
> + vte = dependency('vte-2.90', version: '>=0.32.0',
> + method: 'pkg-config',
> + required: get_option('vte'),
> + kwargs: static_kwargs)
> + endif
The old configure checks didn't have a version number How did you
decide on 0.32 ? This version number doesn't make a whole lot of
sense to me in the way it is used.
vte changes from ABI 2.90 to 2.91 in release 0.37, so you'll never
get a version less than that with vte-2.91 IIUC.
Meanwhile all our supported distros ship 2.91 API now AFAICT, so we
don't need the 2.90 code at all.
I'd suggest dropping vte-2.90 in the configure script first, and then
doing a simpler meson conversion.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
