On Mon, Sep 06, 2021 at 05:39:39PM +0200, Thomas Huth wrote:
> When running "./configure --static --disable-system" there is currently
> a warning if the static version of libpng is missing:
>
> WARNING: Static library 'png16' not found for dependency 'libpng', may not
> be statically linked
>
> Since it does not make sense to look for the VNC-related libraries at all
> when we're building without system emulator binaries, let's add a check
> for have_system here to silence this warning.
>
> Signed-off-by: Thomas Huth <th...@redhat.com>
> ---
> meson.build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index 7e58e6279b..f07236d947 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -931,7 +931,7 @@ vnc = not_found
> png = not_found
> jpeg = not_found
> sasl = not_found
> -if not get_option('vnc').disabled()
> +if have_system and not get_option('vnc').disabled()
> vnc = declare_dependency() # dummy dependency
> png = dependency('libpng', required: get_option('vnc_png'),
> method: 'pkg-config', kwargs: static_kwargs)
Reviewed-by: Daniel P. Berrangé <berra...@redhat.com>
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 :|
