diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2012-11-23 16:41:48 +0100 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2012-12-12 18:15:48 +0100 |
| commit | 55495a61bfd58332f6c8c0074d51b1bc649df5fa (patch) | |
| tree | c333d4b2b80c96a054b3b666c22c4b2cf134138f | |
| parent | 7fe6b6303b83655d8975d72c65eec48024e90761 (diff) | |
| download | spice-55495a61bfd58332f6c8c0074d51b1bc649df5fa.tar.gz spice-55495a61bfd58332f6c8c0074d51b1bc649df5fa.tar.xz spice-55495a61bfd58332f6c8c0074d51b1bc649df5fa.zip | |
build: Use glib2
Now that QEMU depends on glib, it won't really hurt if we depend
on it as well, and we won't have to reinvent our own helpers.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | server/Makefile.am | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index a12e1198..fc0216fa 100644 --- a/configure.ac +++ b/configure.ac @@ -238,6 +238,9 @@ if test "x$enable_smartcard" = "xyes"; then fi +PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= 2.22]) +SPICE_REQUIRES+=" glib-2.0 >= 2.22" + PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7) AC_SUBST(PIXMAN_CFLAGS) AC_SUBST(PIXMAN_LIBS) diff --git a/server/Makefile.am b/server/Makefile.am index b62d98c0..4e5f18aa 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -5,6 +5,7 @@ AM_CPPFLAGS = \ -DRED_STATISTICS \ $(CELT051_CFLAGS) \ $(COMMON_CFLAGS) \ + $(GLIB2_CFLAGS) \ $(PIXMAN_CFLAGS) \ $(SASL_CFLAGS) \ $(SLIRP_CFLAGS) \ @@ -31,6 +32,7 @@ libspice_server_la_LIBADD = \ $(top_builddir)/spice-common/common/libspice-common-server.la \ $(CELT051_LIBS) \ $(GL_LIBS) \ + $(GLIB2_LIBS) \ $(JPEG_LIBS) \ $(LIBRT) \ $(PIXMAN_LIBS) \ |