[Spice-devel] [PATCH 30/30] Require cairo instead of qcairo, only use pixman in server

[Alexander Larsson]

---
 client/x11/Makefile.am |    4 ++--
 configure.ac           |   17 +++++++++++------
 server/Makefile.am     |    4 ++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index d645c38..b34b963 100644
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES = \
 	$(GL_CFLAGS)					\
 	$(ALSA_CFLAGS)					\
 	$(FFMPEG_CFLAGS)				\
-	$(QCAIRO_CFLAGS)				\
+	$(CAIRO_CFLAGS)				\
 	$(LOG4CPP_CFLAGS)				\
 	$(CELT051_CFLAGS)				\
 	$(SSL_CFLAGS)					\
@@ -155,7 +155,7 @@ spicec_LDFLAGS = \
 	$(CEGUI_LIBS)
 
 spicec_LDADD =						\
-	$(QCAIRO_LIBS)					\
+	$(CAIRO_LIBS)					\
 	$(FFMPEG_LIBS)					\
 	$(ALSA_LIBS)					\
 	$(GL_LIBS)					\
diff --git a/configure.ac b/configure.ac
index dc67286..38f8ff6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,12 +120,17 @@ AC_SUBST(SLIRP_CFLAGS)
 AC_SUBST(SLIRP_LIBS)
 SPICE_REQUIRES+=" slirp"
 
-PKG_CHECK_MODULES(QCAIRO, qcairo >= 1.4.6)
-AC_SUBST(QCAIRO_CFLAGS)
-AC_SUBST(QCAIRO_LIBS)
-QCAIRO_LIBDIR=`pkg-config --variable=libdir qcairo`
-AC_SUBST(QCAIRO_LIBDIR)
-SPICE_REQUIRES+=" qcairo >= 1.4.6"
+PKG_CHECK_MODULES(CAIRO, cairo >= 1.4.6)
+AC_SUBST(CAIRO_CFLAGS)
+AC_SUBST(CAIRO_LIBS)
+QCAIRO_LIBDIR=`pkg-config --variable=libdir cairo`
+AC_SUBST(CAIRO_LIBDIR)
+SPICE_REQUIRES+=" cairo >= 1.4.6"
+
+PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.6)
+AC_SUBST(PIXMAN_CFLAGS)
+AC_SUBST(PIXMAN_LIBS)
+SPICE_REQUIRES+=" pixman-1 >= 0.17.6"
 
 PKG_CHECK_MODULES(CELT051, celt051 >= 0.5.1.1)
 AC_SUBST(CELT051_CFLAGS)
diff --git a/server/Makefile.am b/server/Makefile.am
index aaef6a7..f91debd 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = \
 	-I$(top_srcdir)/common/linux	\
 	$(PROTOCOL_CFLAGS)			\
 	$(FFMPEG_CFLAGS)			\
-	$(QCAIRO_CFLAGS)			\
+	$(PIXMAN_CFLAGS)			\
 	$(GL_CFLAGS)				\
 	$(LOG4CPP_CFLAGS)			\
 	$(SSL_CFLAGS)				\
@@ -42,7 +42,7 @@ libspice_la_LDFLAGS = 				\
 libspice_la_LIBADD = 				\
 	$(GL_LIBS)				\
 	$(FFMPEG_LIBS)				\
-	$(QCAIRO_LIBS)				\
+	$(PIXMAN_LIBS)				\
 	$(SSL_LIBS)				\
 	$(CELT051_LIBS)				\
 	$(SLIRP_LIBS)				\
-- 
1.6.6