Only link remote-viewer program against SPICE controller

This commit is contained in:
Daniel P. Berrange 2012-02-16 14:37:22 +00:00
parent 8b18ea0ea5
commit e1064a5355
2 changed files with 4 additions and 4 deletions

View File

@ -120,12 +120,12 @@ AC_ARG_WITH([spice-gtk],
AS_IF([test "x$with_spice_gtk" != "xno"],
[PKG_CHECK_MODULES(SPICE_GTK,
[spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED
spice-controller],
[spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED],
[have_spice_gtk=yes], [have_spice_gtk=no])],
[have_spice_gtk=no])
AS_IF([test "x$have_spice_gtk" = "xyes"],
[PKG_CHECK_MODULES(SPICE_CONTROLLER, [spice-controller])]
[AC_DEFINE([HAVE_SPICE_GTK], 1, [Have spice-gtk?])],
[AS_IF([test "x$with_spice_gtk" = "xyes"],
[AC_MSG_ERROR([spice-gtk requested but not found])

View File

@ -99,6 +99,6 @@ remote_viewer_LDFLAGS += $(GTK_VNC_LIBS)
remote_viewer_CFLAGS += $(GTK_VNC_CFLAGS)
endif
if HAVE_SPICE_GTK
remote_viewer_LDFLAGS += $(SPICE_GTK_LIBS)
remote_viewer_CFLAGS += $(SPICE_GTK_CFLAGS)
remote_viewer_LDFLAGS += $(SPICE_GTK_LIBS) $(SPICE_CONTROLLER_LIBS)
remote_viewer_CFLAGS += $(SPICE_GTK_CFLAGS) $(SPICE_CONTROLLER_CFLAGS)
endif