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
This commit is contained in:
Daniel P. Berrange 2011-11-07 11:25:55 +00:00
parent 9319081827
commit ea5c75645b
2 changed files with 6 additions and 0 deletions

View File

@ -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])

View File

@ -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@ \