[Spice-devel] [RFC 15/33] configure.ac/Makefile.am: add SUPPORT_XSPICE

2011-04-27 Thread Alon Levy 
---
 configure.ac|2 ++
 src/Makefile.am |   23 +++
 2 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 99bc517..6a183df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,6 +86,8 @@ PKG_CHECK_MODULES([SPICE], [spice-server >= 0.6.3],
 )
 PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= 0.7.0])
 
+AM_CONDITIONAL(SUPPORT_XSPICE, test "x$SPICE_LIBS" != "x")
+
 DRIVER_NAME=qxl
 AC_SUBST([DRIVER_NAME])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index ff4fa14..2624039 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,3 +47,26 @@ qxl_drv_la_SOURCES = \
lookup3.c   \
lookup3.h   \
qxl_cursor.c
+
+if SUPPORT_XSPICE
+spiceqxl_drv_la_LTLIBRARIES = spiceqxl_drv.la
+spiceqxl_drv_la_LDFLAGS = -module -avoid-version $(SPICE_LIBS)
+spiceqxl_drv_ladir = @moduledir@/drivers
+
+spiceqxl_drv_la_CFLAGS = -DXSPICE $(AM_CFLAGS)
+
+spiceqxl_drv_la_LIBADD = uxa/libuxa.la
+
+spiceqxl_drv_la_SOURCES =  \
+   qxl.h   \
+   qxl_driver.c\
+   qxl_image.c \
+   qxl_surface.c   \
+   qxl_ring.c  \
+   qxl_mem.c   \
+   mspace.c\
+   mspace.h\
+   lookup3.c   \
+   lookup3.h   \
+   qxl_cursor.c
+endif
-- 
1.7.4.4

___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [RFC 15/33] configure.ac/Makefile.am: add SUPPORT_XSPICE

2011-04-28 Thread Christophe Fergeau 
On Wed, Apr 27, 2011 at 06:56:04PM +0300, Alon Levy wrote:
> ---
>  configure.ac|2 ++
>  src/Makefile.am |   23 +++
>  2 files changed, 25 insertions(+), 0 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 99bc517..6a183df 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -86,6 +86,8 @@ PKG_CHECK_MODULES([SPICE], [spice-server >= 0.6.3],
>  )
>  PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= 0.7.0])
>  
> +AM_CONDITIONAL(SUPPORT_XSPICE, test "x$SPICE_LIBS" != "x")

This test's a bit light :) I guess you want a --enable-xspice configure
flag here?


pgpFbCqVQPtOm.pgp
Description: PGP signature
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [RFC 15/33] configure.ac/Makefile.am: add SUPPORT_XSPICE

2011-04-28 Thread Alon Levy 
On Thu, Apr 28, 2011 at 04:27:50PM +0200, Christophe Fergeau wrote:
> On Wed, Apr 27, 2011 at 06:56:04PM +0300, Alon Levy wrote:
> > ---
> >  configure.ac|2 ++
> >  src/Makefile.am |   23 +++
> >  2 files changed, 25 insertions(+), 0 deletions(-)
> > 
> > diff --git a/configure.ac b/configure.ac
> > index 99bc517..6a183df 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -86,6 +86,8 @@ PKG_CHECK_MODULES([SPICE], [spice-server >= 0.6.3],
> >  )
> >  PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= 0.7.0])
> >  
> > +AM_CONDITIONAL(SUPPORT_XSPICE, test "x$SPICE_LIBS" != "x")
> 
> This test's a bit light :) I guess you want a --enable-xspice configure
> flag here?

Yes, yes, I was hoping to get away with it early (or actually I was hoping
someone would yell at me and then I'd do it).

___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel