[Spice-devel] [linux-vdagent 2/4] build-sys: fix summary with yes/no info on --with-gtk

[Frediano Ziglio]

> 
> Hi,
> 
> On Tue, Jun 05, 2018 at 09:20:19AM -0400, Frediano Ziglio wrote:
> > > 
> > > From: Victor Toso <me at victortoso.com>
> > > 
> > > Before this patch, the summary would have 'auto' instead of yes or no
> > > for building with gtk.
> > > 
> > > Signed-off-by: Victor Toso <victortoso at redhat.com>
> > > ---
> > >  configure.ac | 7 ++++++-
> > >  1 file changed, 6 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/configure.ac b/configure.ac
> > > index aa1751a..bac5219 100644
> > > --- a/configure.ac
> > > +++ b/configure.ac
> > > @@ -82,9 +82,14 @@ AC_ARG_WITH([gtk],
> > >              [],
> > >              [with_gtk="auto"])
> > >  if test "x$with_gtk" != "xno"; then
> > > +  with_gtk_enabled="yes"
> >
> > Maybe gtk_found ?
> 
> IMHO they are interchangeable (both are clear enough)
> 
> >
> > >    PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.10],
> > >                      [AC_DEFINE([WITH_GTK], [1], [If defined, vdagent
> > >                      will
> > >                      favor GTK+ over Xlib])],
> > > -                    [AS_IF([test "x$with_gtk" = "xyes"],
> > > [AC_MSG_ERROR([GTK+
> > > requested but not found])])])
> > > +                    [with_gtk_enabled="no"])
> > > +  if test "$with_gtk" = "yes" && test "$with_gtk_enabled" = "no"; then
> > > +     AC_MSG_ERROR([GTK+ requested but not found])
> > > +  fi
> > > +  with_gtk="$with_gtk_enabled"
> > >  fi
> > >
> > >  AC_ARG_ENABLE([pciaccess],
> >
> > Looks like part of the logic is inside PKG_CHECK_MODULES and part outside.
> > Would not be clear to have all in one place?
> 
> Sorry, my autotools-foo is weak. You mean that I should move the
> if test above to inside the PKG_CHECK_MODULES, more specifically
> to where we have with_gtk_enabled set to 'no'?
> 

one example like

if test "x$with_gtk" != "xno"; then
  PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.10], [
      AC_DEFINE([WITH_GTK], [1], [If defined, vdagent will favor GTK+ over Xlib])
      with_gtk=yes
  ],[
      AS_IF([test "x$with_gtk" = "xyes"], [AC_MSG_ERROR([GTK+ requested but not found])])
      with_gtk=no
  ])
fi

this has the logic inside the PKG_CHECK_MODULES.
Is also more similar to previous code, just set with_gtk again with the value you want.

Feel free to ignore, your version works perfectly.

Frediano