[linux/vd-agent,05/11] configure: depend on gobject

Submitted by marcandre.lureau@redhat.com on March 22, 2019, 3:12 p.m.

Details

Message ID 20190322151246.17766-6-marcandre.lureau@redhat.com
State New
Headers show
Series "Clipboard improvements" ( rev: 2 ) in Spice

Not browsing as part of any series.

Commit Message

marcandre.lureau@redhat.com March 22, 2019, 3:12 p.m.
From: Marc-André Lureau <marcandre.lureau@redhat.com>

The following patches are going to introduce GObject.  It's not a big
change, since usually glib comes installed with gobject on most systems.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 Makefile.am  | 12 ++++++------
 configure.ac |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

Patch hide | download patch | download mbox

diff --git a/Makefile.am b/Makefile.am
index 9d7d31c..d6f5932 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@  src_spice_vdagent_CFLAGS =			\
 	$(DRM_CFLAGS)				\
 	$(X_CFLAGS)				\
 	$(SPICE_CFLAGS)				\
-	$(GLIB2_CFLAGS)				\
+	$(GOBJECT_CFLAGS)			\
 	$(GTK_CFLAGS)				\
 	$(ALSA_CFLAGS)				\
 	-I$(srcdir)/src				\
@@ -28,7 +28,7 @@  src_spice_vdagent_LDADD =			\
 	$(DRM_LIBS)				\
 	$(X_LIBS)				\
 	$(SPICE_LIBS)				\
-	$(GLIB2_LIBS)				\
+	$(GOBJECT_LIBS)				\
 	$(GTK_LIBS)				\
 	$(ALSA_LIBS)				\
 	$(NULL)
@@ -52,7 +52,7 @@  src_spice_vdagent_SOURCES =			\
 
 tests_test_file_xfers_CFLAGS =			\
 	$(SPICE_CFLAGS)				\
-	$(GLIB2_CFLAGS)				\
+	$(GOBJECT_CFLAGS)			\
 	-I$(srcdir)/src				\
 	-I$(srcdir)/src/vdagent			\
 	-DUDSCS_NO_SERVER			\
@@ -60,7 +60,7 @@  tests_test_file_xfers_CFLAGS =			\
 
 tests_test_file_xfers_LDADD =			\
 	$(SPICE_LIBS)				\
-	$(GLIB2_LIBS)				\
+	$(GOBJECT_LIBS)				\
 	$(NULL)
 
 tests_test_file_xfers_SOURCES =			\
@@ -76,7 +76,7 @@  src_spice_vdagentd_CFLAGS =			\
 	$(LIBSYSTEMD_LOGIN_CFLAGS)		\
 	$(PCIACCESS_CFLAGS)			\
 	$(SPICE_CFLAGS)				\
-	$(GLIB2_CFLAGS)				\
+	$(GOBJECT_CFLAGS)			\
 	$(PIE_CFLAGS)				\
 	-I$(srcdir)/src				\
 	$(NULL)
@@ -87,7 +87,7 @@  src_spice_vdagentd_LDADD =			\
 	$(LIBSYSTEMD_LOGIN_LIBS)		\
 	$(PCIACCESS_LIBS)			\
 	$(SPICE_LIBS)				\
-	$(GLIB2_LIBS)				\
+	$(GOBJECT_LIBS)				\
 	$(PIE_LDFLAGS)				\
 	$(NULL)
 
diff --git a/configure.ac b/configure.ac
index 9ba75c9..fb0675f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,7 +100,7 @@  AC_ARG_ENABLE([static-uinput],
               [enable_static_uinput="$enableval"],
               [enable_static_uinput="no"])
 
-PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= 2.34])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.34])
 PKG_CHECK_MODULES(X, [xfixes xrandr >= 1.3 xinerama x11])
 PKG_CHECK_MODULES(SPICE, [spice-protocol >= 0.12.16])
 PKG_CHECK_MODULES(ALSA, [alsa >= 1.0.22])