[virt-tools-list] [virt-viewer 1/3] Bring back libvirt-glib dependency

Eduardo Lima (Etrunko) etrunko at redhat.com
Thu Feb 25 14:04:22 UTC 2016


On 02/23/2016 11:32 AM, Fabiano Fidêncio wrote:
> libvirt-glib dependency was dropped in commit 296f91c in favor to
> maintain the full glib event loop integration into virt-viewer tree.
> This decision was taken because libvirt-glib was not mature enough at
> that time, which is not the case nowadays.
> 
> The libvirt-glib version chosen as dependency (0.1.8) is the first
> release that includes the fixes for the glib event loop integration that
> were backported to virt-viewer last year.
> ---
>  configure.ac              |   5 +-
>  mingw-virt-viewer.spec.in |   2 +
>  src/Makefile.am           |   4 +-
>  src/virt-viewer-events.c  | 459 ----------------------------------------------
>  src/virt-viewer-events.h  |  37 ----
>  src/virt-viewer.c         |   4 +-
>  virt-viewer.spec.in       |   1 +
>  7 files changed, 11 insertions(+), 501 deletions(-)
>  delete mode 100644 src/virt-viewer-events.c
>  delete mode 100644 src/virt-viewer-events.h
> 
> diff --git a/configure.ac b/configure.ac
> index 286c7f5..0eecb00 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -22,6 +22,7 @@ GTK_ENCODED_VERSION="GDK_VERSION_3_10"
>  
>  LIBXML2_REQUIRED="2.6.0"
>  LIBVIRT_REQUIRED="0.10.0"
> +LIBVIRT_GLIB_REQUIRED="0.1.8"
>  GTK_VNC_REQUIRED="0.4.0"
>  SPICE_GTK_REQUIRED="0.30"
>  SPICE_PROTOCOL_REQUIRED="0.12.7"
> @@ -30,6 +31,7 @@ GOVIRT_REQUIRED="0.3.2"
>  AC_SUBST([GLIB2_REQUIRED])
>  AC_SUBST([LIBXML2_REQUIRED])
>  AC_SUBST([LIBVIRT_REQUIRED])
> +AC_SUBST([LIBVIRT_GLIB_REQUIRED])
>  AC_SUBST([GTK_REQUIRED])
>  AC_SUBST([GTK_VNC_REQUIRED])
>  AC_SUBST([SPICE_GTK_REQUIRED])
> @@ -116,6 +118,7 @@ AS_IF([test "x$with_libvirt" != "xno" && test "x$with_libvirt" != "xyes"],
>  
>  AS_IF([test "x$with_libvirt" = "xyes"],
>        [PKG_CHECK_MODULES(LIBVIRT, [libvirt >= $LIBVIRT_REQUIRED])]
> +      [PKG_CHECK_MODULES(LIBVIRT_GLIB, [libvirt-glib-1.0 >= $LIBVIRT_GLIB_REQUIRED])]

Maybe you could join the two checks into one, like:

[PKG_CHECK_MODULES(LIBVIRT, [libvirt >= $LIBVIRT_REQUIRED
libvirt-glib-1.0 >= $LIBVIRT_GLIB_REQUIRED])]

This would remove the need of LIBVIRT_GLIB_{CFLAGS,LIBS} in Makefile.am
files all around the code.

Reviewed-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
-- 
Eduardo de Barros Lima (Etrunko)
Software Engineer - RedHat
etrunko at redhat.com




More information about the virt-tools-list mailing list