diff options
| author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-02-20 15:00:02 -0600 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2015-02-23 23:00:47 +0100 |
| commit | 990cae2220db0d6f3164e9f3089797fe3b59731f (patch) | |
| tree | ef558fb816dcbaa25c4a283f7c30f57ac20be241 | |
| parent | 69717b01851b1e0c5b06db860c6f1c7e254a116a (diff) | |
| download | spice-990cae2220db0d6f3164e9f3089797fe3b59731f.tar.gz spice-990cae2220db0d6f3164e9f3089797fe3b59731f.tar.xz spice-990cae2220db0d6f3164e9f3089797fe3b59731f.zip | |
Add GObject to build requirements
Preparation for GObject-ifying some internals
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | server/Makefile.am | 2 | ||||
| -rw-r--r-- | server/tests/Makefile.am | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 4e57ef3e..2271df88 100644 --- a/configure.ac +++ b/configure.ac @@ -141,6 +141,9 @@ fi PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= 2.22]) AS_VAR_APPEND([SPICE_REQUIRES], [" glib-2.0 >= 2.22"]) +PKG_CHECK_MODULES([GOBJECT2], [gobject-2.0 >= 2.22]) +AS_VAR_APPEND([SPICE_REQUIRES], [" gobject-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 f1d958f4..303e8917 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ $(CELT051_CFLAGS) \ $(COMMON_CFLAGS) \ $(GLIB2_CFLAGS) \ + $(GOBJECT2_CFLAGS) \ $(LZ4_CFLAGS) \ $(PIXMAN_CFLAGS) \ $(SASL_CFLAGS) \ @@ -36,6 +37,7 @@ libspice_server_la_LIBADD = \ $(top_builddir)/spice-common/common/libspice-common-server.la \ $(GL_LIBS) \ $(GLIB2_LIBS) \ + $(GOBJECT2_LIBS) \ $(JPEG_LIBS) \ $(LZ4_LIBS) \ $(LIBRT) \ diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am index e3409f29..52f14485 100644 --- a/server/tests/Makefile.am +++ b/server/tests/Makefile.am @@ -1,7 +1,6 @@ NULL = AM_CPPFLAGS = \ - $(GLIB2_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/common \ -I$(top_srcdir)/server \ @@ -9,6 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/server/tests \ $(COMMON_CFLAGS) \ $(GLIB2_CFLAGS) \ + $(GOBJECT2_CFLAGS) \ $(SMARTCARD_CFLAGS) \ $(SPICE_NONPKGCONFIG_CFLAGS) \ $(NULL) @@ -18,10 +18,10 @@ AM_CPPFLAGS += -DAUTOMATED_TESTS endif LDADD = \ - $(GLIB2_LIBS) \ $(top_builddir)/spice-common/common/libspice-common.la \ $(top_builddir)/server/libspice-server.la \ $(GLIB2_LIBS) \ + $(GOBJECT2_LIBS) \ $(NULL) COMMON_BASE = \ |