summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2012-02-16 14:37:22 +0000
committerDaniel P. Berrange <berrange@redhat.com>2012-02-16 14:37:22 +0000
commite1064a5355005fb5f780ce75fd5e64cd6ff80e74 (patch)
tree024080bd34a7124d83f790082e060856bd60148f
parent8b18ea0ea5354940b1c29a437280603a9e415cac (diff)
downloadvirt-viewer-e1064a5355005fb5f780ce75fd5e64cd6ff80e74.tar.gz
virt-viewer-e1064a5355005fb5f780ce75fd5e64cd6ff80e74.tar.xz
virt-viewer-e1064a5355005fb5f780ce75fd5e64cd6ff80e74.zip
Only link remote-viewer program against SPICE controller
-rw-r--r--configure.ac4
-rw-r--r--src/Makefile.am4
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 56281df..f90631e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
diff --git a/src/Makefile.am b/src/Makefile.am
index 0128070..c408cdd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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