Re: [PATCH v7 04/11] slirp: feature detection for smbd

[Joelle van Dyne]

On Fri, Jan 22, 2021 at 2:49 PM Peter Maydell <peter.maydell@linaro.org> wrote:
>
> On Fri, 22 Jan 2021 at 20:16, Joelle van Dyne <j@getutm.app> wrote:
> >
> > Replace Windows specific macro with a more generic feature detection
> > macro. Allows slirp smb feature to be disabled manually as well.
> >
> > Signed-off-by: Joelle van Dyne <j@getutm.app>
> > ---
>
>
> > +if test "$slirp_smbd" = "yes" ; then
> > +  echo "CONFIG_SLIRP_SMBD=y" >> $config_host_mak
> > +  echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
> > +fi
>
> This sets "CONFIG_SLIRP_SMBD" and "CONFIG_SMBD_COMMAND"...
>
> >  if test "$vde" = "yes" ; then
> >    echo "CONFIG_VDE=y" >> $config_host_mak
> >    echo "VDE_LIBS=$vde_libs" >> $config_host_mak
> > diff --git a/meson.build b/meson.build
> > index 6c3ee7f8ca..9577138d7f 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -2331,7 +2331,7 @@ summary_info += {'sphinx-build':      
> > sphinx_build.found()}
> >  summary_info += {'genisoimage':       config_host['GENISOIMAGE']}
> >  # TODO: add back version
> >  summary_info += {'slirp support':     slirp_opt == 'disabled' ? false : 
> > slirp_opt}
> > -if slirp_opt != 'disabled'
> > +if slirp_opt != 'disabled' and 'HAVE_HOST_SMBD' in config_host
>
> ...but this is looking for "HAVE_HOST_SMBD". Should it be something else?
Yes, it is a typo, will fix.

-j
>
> >    summary_info += {'smbd':            config_host['CONFIG_SMBD_COMMAND']}
> >  endif
> >  summary_info += {'module support':    
> > config_host.has_key('CONFIG_MODULES')}
>
> thanks
> -- PMM