[Spice-devel] [PATCH xf86-video-qxl v2 (really)] Bug fix: libcacard headers and libraries were not correctly used.

[Jeremy White]

Also shift to libspiceccid_la_CFLAGS.

Signed-off-by: Jeremy White <jwhite at codeweavers.com>
---
 src/spiceccid/Makefile.am | 5 ++---
 src/spiceccid/spiceccid.c | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/spiceccid/Makefile.am b/src/spiceccid/Makefile.am
index 437e992..7f662fe 100644
--- a/src/spiceccid/Makefile.am
+++ b/src/spiceccid/Makefile.am
@@ -19,11 +19,10 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-AM_CFLAGS = $(LIBPCSCLITE_CFLAGS)
-
 if BUILD_SPICECCID
 libspiceccid_la_LTLIBRARIES = libspiceccid.la
-libspiceccid_la_LDFLAGS     = $(LIBPCSCLITE_LDFLAGS)
+libspiceccid_la_CFLAGS      = $(LIBPCSCLITE_CFLAGS) $(LIBCACARD_CFLAGS)
+libspiceccid_la_LDFLAGS     = $(LIBPCSCLITE_LDFLAGS) $(LIBCACARD_LDFLAGS)
 libspiceccid_la_SOURCES     = spiceccid.c
 libspiceccid_ladir          = @cciddir@/
 endif
diff --git a/src/spiceccid/spiceccid.c b/src/spiceccid/spiceccid.c
index 904a98c..67af6cb 100644
--- a/src/spiceccid/spiceccid.c
+++ b/src/spiceccid/spiceccid.c
@@ -44,7 +44,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "cacard/vscard_common.h"
+#include "vscard_common.h"
 #include "ifdhandler.h"
 #include <arpa/inet.h>
 
-- 
2.1.4