[Spice-commits] 2 commits - configure.ac server/reds_stream.c spice-common

[Christophe Fergau]

 configure.ac         |    2 +-
 server/reds_stream.c |    4 ++++
 spice-common         |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit d9fa872a944ded5953f7151280f5c0cc1611bad0
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Mar 19 15:15:13 2014 +0100

    build-sys: Fix VPATH builds
    
    Fixing this is a matter of picking the spice-common fix to generate the
    (de)marshaller source files in the right place, and to adjust the compiler
    flags to look for includes in the build directory as well.

diff --git a/configure.ac b/configure.ac
index e4ba9b2..6fe566f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,7 +157,7 @@ dnl =========================================================================
 dnl Check deps
 
 AC_CONFIG_SUBDIRS([spice-common])
-COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_srcdir}/spice-common/spice-protocol/'
+COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_builddir}/spice-common/ -I ${top_srcdir}/spice-common/spice-protocol/'
 AC_SUBST(COMMON_CFLAGS)
 
 AC_CHECK_LIBM
diff --git a/spice-common b/spice-common
index 6edeb43..9f8ba3a 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit 6edeb43747b6161cbff3bc7c18d221d81f2d3eb9
+Subproject commit 9f8ba3af8047a1d51cd6b76014b89f6251e08391
commit db984941af2db36859de9e3e1cf65d0a19c6b481
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Mar 19 14:00:09 2014 +0100

    Fix --without-sasl build
    
    There are 2 SASL-related function prototypes which are unused in the
    --without-sasl case. They cause a warning, and a build failure
    when using -Werror. Wrapping them in #if HAVE_SASL avoids this issue.

diff --git a/server/reds_stream.c b/server/reds_stream.c
index 873b953..bc423a1 100644
--- a/server/reds_stream.c
+++ b/server/reds_stream.c
@@ -162,7 +162,9 @@ void reds_stream_remove_watch(RedsStream* s)
     }
 }
 
+#if HAVE_SASL
 static ssize_t reds_stream_sasl_read(RedsStream *s, uint8_t *buf, size_t nbyte);
+#endif
 
 ssize_t reds_stream_read(RedsStream *s, void *buf, size_t nbyte)
 {
@@ -196,7 +198,9 @@ bool reds_stream_write_all(RedsStream *stream, const void *in_buf, size_t n)
     return TRUE;
 }
 
+#if HAVE_SASL
 static ssize_t reds_stream_sasl_write(RedsStream *s, const void *buf, size_t nbyte);
+#endif
 
 ssize_t reds_stream_write(RedsStream *s, const void *buf, size_t nbyte)
 {