[Spice-devel] [PATCH 1/2] configure.ac: Only check for xinerama for client builds

[Marc-André Lureau]

----- Original Message -----
> On Fri, Nov 21, 2014 at 10:52:20AM +0100, Christophe Fergeau wrote:
> > Xinerama support is only used for the X11 client, but is currently
> > being checked even for server only builds. This commit ensures Xinerama
> > is not checked for/added to spice-server.pc when not building the
> > client.

Why is it ever added to SPICE_REQUIRES and spice-server.pc?

> > ---
> >  configure.ac | 36 ++++++++++++++++++------------------
> >  1 file changed, 18 insertions(+), 18 deletions(-)
> > 
> > diff --git a/configure.ac b/configure.ac
> > index 3c81adf..7a5a8ec 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -272,6 +272,11 @@ AC_SUBST(GL_CFLAGS)
> >  AC_SUBST(GL_LIBS)
> >  AS_VAR_APPEND([SPICE_NONPKGCONFIG_LIBS], [" $GL_LIBS"])
> >  
> > +# Add parameter for libXinerama
> > +AC_ARG_ENABLE([xinerama],
> > +    [AS_HELP_STRING([--disable-xinerama],
> > +        [disable Xinerama library @<:@default=no@:>@])])
> > +
> >  if test "x$red_target" = "xx11" && test "x$enable_client" = "xyes" ; then
> >  	if test "$os_linux" = yes; then
> >  		PKG_CHECK_MODULES(ALSA, alsa)
> > @@ -291,8 +296,21 @@ if test "x$red_target" = "xx11" && test
> > "x$enable_client" = "xyes" ; then
> >  	        xrandr >= 1.2,
> >  	        have_xrandr12=yes,
> >  	        have_xrandr12=no)
> > +
> > +	if test "x$enable_xinerama" != "xno"; then
> > +	    PKG_CHECK_MODULES(XINERAMA,
> > +			      xinerama >= 1.0,
> > +			      have_xinerama=yes,
> > +			      have_xinerama=no)
> > +	else
> > +	    have_xinerama=no
> > +	fi
> > +	if test "x$enable_xinerama" = "xyes" && test "x$have_xinerama" = "xno";
> > then
> > +	    AC_MSG_ERROR([Requested Xinerama library was not found])
> > +	fi
> >  else
> >  	have_xrandr12=no
> > +	have_xinerama=no
> >  fi
> >  
> >  AM_CONDITIONAL([HAVE_XRANDR12], [test "x$have_xrandr12" = "xyes"])
> > @@ -300,24 +318,6 @@ if test "x$have_xrandr12" = "xyes" ; then
> >    AC_DEFINE([HAVE_XRANDR12], [], [Define if we have XRANDR 12])
> >  fi
> >  
> > -# Add parameter for libXinerama
> > -AC_ARG_ENABLE([xinerama],
> > -    [AS_HELP_STRING([--disable-xinerama],
> > -        [disable Xinerama library @<:@default=no@:>@])])
> > -
> > -if test "x$enable_xinerama" != "xno"; then
> > -    PKG_CHECK_MODULES(XINERAMA,
> > -        xinerama >= 1.0,
> > -        have_xinerama=yes,
> > -        have_xinerama=no)
> > -else
> > -    have_xinerama=no
> > -fi
> > -
> > -if test "x$enable_xinerama" = "xyes" && test "x$have_xinerama" = "xno";
> > then
> > -    AC_MSG_ERROR([Requested Xinerama library was not found])
> > -fi
> > -
> >  AM_CONDITIONAL([HAVE_XINERAMA], [test "x$have_xinerama" = "xyes"])
> >  if test "x$have_xinerama" = "xyes" ; then
> >    AC_DEFINE([HAVE_XINERAMA], [], [Define if we have Xinerama])
> > --
> > 2.1.0
> > 
> > _______________________________________________
> > Spice-devel mailing list
> > Spice-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/spice-devel
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
>