[Spice-devel] [PATCH spice-server 3/33 v2] build: Detect Windows build and change some definitions

[Frediano Ziglio]

> 
> On Wed, Jan 02, 2019 at 02:58:45PM +0000, Frediano Ziglio wrote:
> > Windows needs some specific setting to use network.
> > 
> > Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> > ---
> >  configure.ac | 20 +++++++++++++++++++-
> >  1 file changed, 19 insertions(+), 1 deletion(-)
> > 
> > Changes since v1:
> > - all changes in configure.ac
> > 
> > diff --git a/configure.ac b/configure.ac
> > index 96e4e66c..afe0017d 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -68,6 +68,20 @@ case $host_cpu in
> >          SPICE_WARNING([spice-server on non-x86_64 architectures has not
> >          been extensively tested])
> >  esac
> >  
> > +AC_MSG_CHECKING([for native Win32])
> > +case "$host_os" in
> > +     *mingw*|*cygwin*)
> > +        os_win32=yes
> > +        dnl Some code requires at least Vista
> > +        AC_DEFINE([_WIN32_WINNT], [0x600], [Minimal Win32 version])]
> 
> Can this be part of the commit which adds code which needs Vista
> behaviour? This way git blame would tell which code started to require at
> least
> Vista.
> 

AI_ADDRCONFIG in reds.c which is already in master.

> > +        ;;
> > +     *)
> > +        os_win32=no
> > +        ;;
> > +esac
> > +AC_MSG_RESULT([$os_win32])
> > +AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
> > +
> >  dnl
> >  =========================================================================
> >  dnl Check optional features
> >  SPICE_CHECK_SMARTCARD
> > @@ -153,6 +167,9 @@ AC_CHECK_LIB(rt, clock_gettime, LIBRT="-lrt")
> >  AC_SUBST(LIBRT)
> >  
> >  AS_VAR_APPEND([SPICE_NONPKGCONFIG_LIBS], [" -pthread $LIBM $LIBRT"])
> > +AS_IF([test "x$os_win32" = "xyes"], [
> > +    AS_VAR_APPEND([SPICE_NONPKGCONFIG_LIBS], [" -lws2_32"])
> > +])
> 
> I'd be tempted to also add this when it becomes really needed?

It's the socket library so it's already needed, unless I move to
the commit where Windows is supposed to start compiling but then would
make sense to squash most patches in a single commit.

> 
> Christophe
> 
> >  
> >  SPICE_REQUIRES=""
> >  
> > @@ -175,7 +192,8 @@ PKG_CHECK_MODULES([GOBJECT2], [gobject-2.0 >=
> > $GLIB2_REQUIRED])
> >  AS_VAR_APPEND([SPICE_REQUIRES], [" gobject-2.0 >= $GLIB2_REQUIRED"])
> >  
> >  #used only by tests
> > -PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= $GLIB2_REQUIRED])
> > +AS_IF([test "x$os_win32" != "xyes"],
> > +      PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= $GLIB2_REQUIRED]))
> >  
> >  PIXMAN_REQUIRED=0.17.7
> >  PKG_CHECK_MODULES(PIXMAN, pixman-1 >= $PIXMAN_REQUIRED)

Frediano