From ea5c75645be7835e3f7eaa76992d8897a2f2c25d Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Mon, 7 Nov 2011 11:25:55 +0000
Subject: [PATCH] Revert 1a56de3acad6a19fd958fae9278cf1c97fdabb18

The GLIB2 check previously removed was misleading because it in
fact checked for gmodule-export-2.0 which is needed to export
the signal handlers. Revert the previous commit, but rename the
var to GMODULE2 to make it clearer
---
 configure.ac    | 4 ++++
 src/Makefile.am | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/configure.ac b/configure.ac
index 9ddf018..e7985d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,7 @@ AC_CANONICAL_HOST
 m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
 AM_SILENT_RULES([yes])
 
+GMODULE2_REQUIRED=2.12.0
 LIBXML2_REQUIRED="2.6.0"
 LIBVIRT_REQUIRED="0.6.0"
 GTK2_REQUIRED="2.12.0"
@@ -34,6 +35,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 IT_PROG_INTLTOOL([0.35.0])
 
 
+PKG_CHECK_MODULES(GMODULE2, gmodule-export-2.0 >= $GMODULE2_REQUIRED)
 PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_REQUIRED)
 PKG_CHECK_MODULES(LIBVIRT, libvirt >= $LIBVIRT_REQUIRED)
 
@@ -133,6 +135,8 @@ AC_MSG_NOTICE([      Gtk: $with_gtk])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([ Libraries:])
 AC_MSG_NOTICE([])
+AC_MSG_NOTICE([    GMODULE2: $GMODULE2_CFLAGS $GMODULE2_LIBS])
+AC_MSG_NOTICE([])
 AC_MSG_NOTICE([         GTK: $GTK_CFLAGS $GTK_LIBS])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([     GTK_VNC: $GTK_VNC_CFLAGS $GTK_VNC_LIBS])
diff --git a/src/Makefile.am b/src/Makefile.am
index 0870177..d0aa73a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,6 +39,7 @@ endif
 virt_viewer_LDADD = \
 	@GTK_VNC_LIBS@ \
 	@SPICE_GTK_LIBS@ \
+	@GMODULE2_LIBS@ \
 	@GTK_LIBS@ \
 	@LIBXML2_LIBS@ \
 	@LIBVIRT_LIBS@
@@ -46,6 +47,7 @@ virt_viewer_LDADD = \
 virt_viewer_CFLAGS = \
 	@GTK_VNC_CFLAGS@ \
 	@SPICE_GTK_CFLAGS@ \
+	@GMODULE2_CFLAGS@ \
 	@GTK_CFLAGS@ \
 	@LIBXML2_CFLAGS@ \
 	@LIBVIRT_CFLAGS@ \