On Mon, Jan 25, 2021 at 11:30 PM Philippe Mathieu-Daudé
<phi...@redhat.com> wrote:
>
> On 1/26/21 2:24 AM, Joelle van Dyne 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>
> > ---
> > configure | 22 +++++++++++++++++++++-
> > meson.build | 2 +-
> > net/slirp.c | 16 ++++++++--------
> > 3 files changed, 30 insertions(+), 10 deletions(-)
> >
> > diff --git a/configure b/configure
> > index 8d8a4733d7..d72ab22da5 100755
> > --- a/configure
> > +++ b/configure
> > @@ -464,6 +464,7 @@ fuse="auto"
> > fuse_lseek="auto"
> >
> > malloc_trim="auto"
> > +slirp_smbd="auto"
> >
> > # parse CC options second
> > for opt do
> > @@ -845,7 +846,18 @@ do
> > fi
> > done
> >
> > +# Check for smbd dupport
> > : ${smbd=${SMBD-/usr/sbin/smbd}}
> > +if test "$slirp_smbd" != "no" ; then
>
> Here slirp_smbd is always "auto".
>
> > + if test "$mingw32" = "yes" ; then
> > + if test "$slirp_smbd" = "yes" ; then
> > + error_exit "Host smbd not supported on this platform."
> > + fi
> > + slirp_smbd=no
> > + else
> > + slirp_smbd=yes
> > + fi
> > +fi
>
> So this check ...
>
> >
> > # Default objcc to clang if available, otherwise use CC
> > if has clang; then
> > @@ -1560,6 +1572,10 @@ for opt do
> > ;;
> > --disable-fuse-lseek) fuse_lseek="disabled"
> > ;;
> > + --enable-slirp-smbd) slirp_smbd=yes
> > + ;;
> > + --disable-slirp-smbd) slirp_smbd=no
> > + ;;
> > *)
>
> ... should be placed after the cmdline options processing,
> isn't it?
That's right, good catch.
>
