From e1064a5355005fb5f780ce75fd5e64cd6ff80e74 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Thu, 16 Feb 2012 14:37:22 +0000
Subject: Only link remote-viewer program against SPICE controller

---
 configure.ac    | 4 ++--
 src/Makefile.am | 4 ++--
 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
-- 
cgit