[gtk-vnc] Add GIO when generating introspection for gvnc library

[Daniel P. Berrange <dberrange src gnome org>]

commit 236af4c158dc93980ea144398ab60e9b01c6e43b
Author: Daniel P. Berrange <berrange redhat com>
Date:   Thu Jul 21 10:54:13 2016 +0100

    Add GIO when generating introspection for gvnc library
    
    The gvnc library depends on some GIO data types, so this
    library should be included when generating introspection.
    
    This fixes the warning:
    
    vncconnection.h:166: Warning: GVnc: vnc_connection_open_addr: argument addr: Unresolved type: 
u'GSocketAddress*'
    
    Signed-off-by: Daniel P. Berrange <berrange redhat com>

 src/Makefile.am  |    4 ++--
 vapi/Makefile.am |   26 ++++++++++++++++----------
 2 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 8712abe..207e3c5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -382,8 +382,8 @@ GTK_VNC_INTROSPECTION_SRCS += \
 endif
 
 GVnc-1.0.gir: libgvnc-1.0.la
-GVnc_1_0_gir_INCLUDES = GObject-2.0
-GVnc_1_0_gir_PACKAGES = gobject-2.0
+GVnc_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+GVnc_1_0_gir_PACKAGES = gobject-2.0 gio-2.0
 GVnc_1_0_gir_EXPORT_PACKAGES = gvnc-1.0
 GVnc_1_0_gir_LIBS = libgvnc-1.0.la
 GVnc_1_0_gir_FILES = $(GVNC_INTROSPECTION_SRCS)
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index f91264b..40e070d 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -15,26 +15,32 @@ endif
 
 gvnc-1.0.vapi: $(top_builddir)/src/GVnc-1.0.gir
        $(AM_V_GEN)$(VAPIGEN)                   \
+               --pkg gobject-2.0               \
+               --pkg gio-2.0                   \
                --library gvnc-1.0              \
                $<
 
 if HAVE_PULSEAUDIO
 gvncpulse-1.0.vapi: $(top_builddir)/src/GVncPulse-1.0.gir gvnc-1.0.vapi
        $(AM_V_GEN)$(VAPIGEN)                   \
-               --vapidir=$(builddir)                           \
-               --pkg gvnc-1.0                                  \
-               --library gvncpulse-1.0                         \
-               --girdir=$(top_builddir)/src                    \
+               --vapidir=$(builddir)           \
+               --pkg gobject-2.0               \
+               --pkg gio-2.0                   \
+               --pkg gvnc-1.0                  \
+               --library gvncpulse-1.0         \
+               --girdir=$(top_builddir)/src    \
                $<
 endif
 
 gtk-vnc-$(GTK_VNC_API_VERSION).vapi: $(top_builddir)/src/GtkVnc-$(GTK_VNC_API_VERSION).gir gvnc-1.0.vapi
-       $(AM_V_GEN)$(VAPIGEN)                                   \
-               --vapidir=$(builddir)                           \
-               --pkg gvnc-1.0                                  \
-               --pkg gtk+-$(GTK_API_VERSION)                   \
-               --library gtk-vnc-$(GTK_VNC_API_VERSION)        \
-               --girdir=$(top_builddir)/src                    \
+       $(AM_V_GEN)$(VAPIGEN)                   \
+               --vapidir=$(builddir)           \
+               --pkg gobject-2.0               \
+               --pkg gio-2.0                   \
+               --pkg gvnc-1.0                  \
+               --pkg gtk+-$(GTK_API_VERSION)   \
+               --library gtk-vnc-$(GTK_VNC_API_VERSION) \
+               --girdir=$(top_builddir)/src    \
                $<
 
 gtk-vnc-$(GTK_VNC_API_VERSION).deps: gtk-vnc-$(GTK_VNC_API_VERSION).vapi