From: Visarion Alexandru <[email protected]>
We will need a GInetAddress for setting a graphics device's
listen address, so let's include GIO2 in libvirt-gconfig.
---
configure.ac | 2 ++
libvirt-gconfig-1.0.pc.in | 2 +-
libvirt-gconfig/Makefile.am | 6 ++++--
vapi/Makefile.am | 1 +
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8edde74..647a5ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,6 +112,8 @@ PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_TEST_REQUIRED,
PKG_CHECK_MODULES(GTHREAD2, gthread-2.0 >= $GLIB2_REQUIRED)
PKG_CHECK_MODULES(GOBJECT2, gobject-2.0 >= $GLIB2_REQUIRED)
PKG_CHECK_MODULES(GIO2, gio-2.0 >= $GLIB2_REQUIRED)
+AC_SUBST(GIO2_CFLAGS)
+AC_SUBST(GIO2_LIBS)
PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_REQUIRED)
AM_CONDITIONAL([ENABLE_TESTS], [test "$enable_tests" = "yes"])
diff --git a/libvirt-gconfig-1.0.pc.in b/libvirt-gconfig-1.0.pc.in
index a8cb5ac..c0212f8 100644
--- a/libvirt-gconfig-1.0.pc.in
+++ b/libvirt-gconfig-1.0.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: libvirt-gconfig
Version: @VERSION@
Description: libvirt GConfig library
-Requires: gobject-2.0 libxml-2.0
+Requires: gobject-2.0 libxml-2.0 gio-2.0
Libs: -L${libdir} -lvirt-gconfig-1.0
Cflags: -I${includedir}/libvirt-gconfig-1.0
diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am
index 0400343..1a9a97a 100644
--- a/libvirt-gconfig/Makefile.am
+++ b/libvirt-gconfig/Makefile.am
@@ -209,10 +209,12 @@ libvirt_gconfig_1_0_la_CFLAGS = \
-I$(top_builddir) \
$(GOBJECT2_CFLAGS) \
$(LIBXML2_CFLAGS) \
+ $(GIO2_CFLAGS) \
$(WARN_CFLAGS)
libvirt_gconfig_1_0_la_LIBADD = \
$(GOBJECT2_LIBS) \
$(LIBXML2_LIBS) \
+ $(GIO2_LIBS) \
$(CYGWIN_EXTRA_LIBADD)
libvirt_gconfig_1_0_la_DEPENDENCIES = \
libvirt-gconfig.sym
@@ -253,8 +255,8 @@ INTROSPECTION_GIRS =
if HAVE_INTROSPECTION
LibvirtGConfig-1.0.gir: libvirt-gconfig-1.0.la
-LibvirtGConfig_1_0_gir_INCLUDES = GObject-2.0
-LibvirtGConfig_1_0_gir_PACKAGES = gobject-2.0
+LibvirtGConfig_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+LibvirtGConfig_1_0_gir_PACKAGES = gobject-2.0 gio-2.0
LibvirtGConfig_1_0_gir_EXPORT_PACKAGES = libvirt-gconfig-1.0
LibvirtGConfig_1_0_gir_LIBS = libvirt-gconfig-1.0.la
LibvirtGConfig_1_0_gir_FILES = \
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 568de4f..dc98bd1 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -33,6 +33,7 @@ libvirt-gconfig-1.0.vapi:
$(top_builddir)/libvirt-gconfig/LibvirtGConfig-1.0.gir
$(AM_V_GEN)$(VAPIGEN) \
--vapidir=$(builddir) \
--pkg gobject-2.0 \
+ --pkg gio-2.0 \
--library libvirt-gconfig-1.0 \
$<
--
2.7.4
--
libvir-list mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/libvir-list
