Hi
On Wed, Oct 25, 2023 at 3:53 PM Thomas Huth <th...@redhat.com> wrote:
>
> On 23/10/2023 13.30, marcandre.lur...@redhat.com wrote:
> > From: Marc-André Lureau <marcandre.lur...@redhat.com>
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> > ---
> > meson.build | 6 +++++-
> > ui/meson.build | 4 ++--
> > 2 files changed, 7 insertions(+), 3 deletions(-)
> >
> > diff --git a/meson.build b/meson.build
> > index 395d7155f6..c4dd9e01ea 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -1536,7 +1536,11 @@ endif
> > vnc = not_found
> > jpeg = not_found
> > sasl = not_found
> > -if get_option('vnc').allowed() and have_system
> > +if get_option('vnc') \
> > + .disable_auto_if(not have_system) \
> > + .require(pixman.found(),
> > + error_message: 'cannot enable VNC if pixman is not
> > available') \
> > + .allowed()
> > vnc = declare_dependency() # dummy dependency
> > jpeg = dependency('libjpeg', required: get_option('vnc_jpeg'),
> > method: 'pkg-config')
> > diff --git a/ui/meson.build b/ui/meson.build
> > index 7c99613950..b3525ef064 100644
> > --- a/ui/meson.build
> > +++ b/ui/meson.build
> > @@ -46,8 +46,8 @@ vnc_ss.add(files(
> > ))
> > vnc_ss.add(zlib, jpeg, gnutls)
> > vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c'))
> > -system_ss.add_all(when: vnc, if_true: vnc_ss)
> > -system_ss.add(when: vnc, if_false: files('vnc-stubs.c'))
> > +system_ss.add_all(when: [vnc, pixman], if_true: vnc_ss)
> > +system_ss.add(when: [vnc, pixman], if_false: files('vnc-stubs.c'))
>
> Is the change to ui/meson.build required at all? ... if I get the first hunk
> right, if "vnc" is enabled, that means that pixman has been found, too?
Well, this is a bit more explicit, to get the dependencies correct
(flags and such) without relying on other system_ss units
dependencies.. I'd keep it.
--
Marc-André Lureau
