[virt-tools-list] [virt-viewer] configure: Simplify libvirt/libvirt-glib handling

[Fabiano Fidêncio]

Merge libvirt and libvirt-glib checking in PKG_CHECK_MODULES, then we
don't nee the LIBVIRT_GLIB_{CFLAGS,LIBS} in Makefile.am

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
 configure.ac    | 5 ++---
 src/Makefile.am | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0eecb00..33362f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,8 +117,7 @@ AS_IF([test "x$with_libvirt" != "xno" && test "x$with_libvirt" != "xyes"],
                         [with_libvirt=yes], [with_libvirt=no])])
 
 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])]
+      [PKG_CHECK_MODULES(LIBVIRT, [libvirt >= $LIBVIRT_REQUIRED] [libvirt-glib-1.0 >= $LIBVIRT_GLIB_REQUIRED])]
       [AC_DEFINE([HAVE_LIBVIRT], 1, [Have libvirt?])]
 )
 AM_CONDITIONAL([HAVE_LIBVIRT], [test "x$with_libvirt" = "xyes"])
@@ -270,7 +269,7 @@ AC_MSG_NOTICE([   SPICE_GTK: $SPICE_GTK_CFLAGS $SPICE_GTK_LIBS])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([     LIBXML2: $LIBXML2_CFLAGS $LIBXML2_LIBS])
 AC_MSG_NOTICE([])
-AC_MSG_NOTICE([     LIBVIRT: $LIBVIRT_CFLAGS $LIBVIRT_LIBS $LIBVIRT_GLIB_CFLAGS $LIBVIRT_GLIB_LIBS])
+AC_MSG_NOTICE([     LIBVIRT: $LIBVIRT_CFLAGS $LIBVIRT_LIBS])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([       OVIRT: $OVIRT_CFLAGS $OVIRT_LIBS])
 AC_MSG_NOTICE([])
diff --git a/src/Makefile.am b/src/Makefile.am
index b1fe667..f42a7bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -150,12 +150,10 @@ virt_viewer_SOURCES =					\
 virt_viewer_LDFLAGS =				\
 	$(COMMON_LIBS)				\
 	$(LIBVIRT_LIBS)				\
-	$(LIBVIRT_GLIB_LIBS)		\
 	$(NULL)
 virt_viewer_CFLAGS = 				\
 	$(COMMON_CFLAGS) 			\
 	$(LIBVIRT_CFLAGS)			\
-	$(LIBVIRT_GLIB_CFLAGS)		\
 	$(NULL)
 virt_viewer_LDADD = \
 	libvirt-viewer.la \
-- 
2.5.0