[Spice-commits] 2 commits - configure.ac server/lz4-encoder.c server/Makefile.am spice-common

[Eduardo Lima]

 configure.ac         |    2 +-
 server/Makefile.am   |    9 +++++++--
 server/lz4-encoder.c |    4 ----
 spice-common         |    2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit d7fb7b0b36545dbc58b5b83beebdecf4819a4169
Author: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Date:   Wed Jun 15 16:27:48 2016 -0300

    Move lz4-encoder.[ch] to conditional block in Makefile.am
    
    Let's follow the 'standard' for optional components. This commit also
    drops (now) unecessary #ifdef USE_LZ4 from lz4-encode.c, as the decision
    to build this file is now made in Makefile.
    
    Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/server/Makefile.am b/server/Makefile.am
index 09710eb..0af8a1b 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -88,8 +88,6 @@ libserver_la_SOURCES =				\
 	inputs-channel-client.h		\
 	jpeg-encoder.c				\
 	jpeg-encoder.h				\
-	lz4-encoder.c				\
-	lz4-encoder.h				\
 	main-channel.c				\
 	main-channel.h				\
 	main-channel-client.c			\
@@ -154,6 +152,13 @@ libserver_la_SOURCES =				\
 	dcc-encoders.h					\
 	$(NULL)
 
+if HAVE_LZ4
+libserver_la_SOURCES +=	\
+	lz4-encoder.c				\
+	lz4-encoder.h				\
+	$(NULL)
+endif
+
 if HAVE_SMARTCARD
 libserver_la_SOURCES +=	\
 	smartcard.c		\
diff --git a/server/lz4-encoder.c b/server/lz4-encoder.c
index 7b6359f..f193fd8 100644
--- a/server/lz4-encoder.c
+++ b/server/lz4-encoder.c
@@ -18,8 +18,6 @@
 #include <config.h>
 #endif
 
-#ifdef USE_LZ4
-
 #define SPICE_LOG_DOMAIN "SpiceLz4Encoder"
 
 #include <arpa/inet.h>
@@ -119,5 +117,3 @@ int lz4_encode(Lz4EncoderContext *lz4, int height, int stride, uint8_t *io_ptr,
 
     return out_size;
 }
-
-#endif // USE_LZ4
commit ed429a618e9fbae6422143320ecd7483fc4c49dc
Author: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Date:   Wed Jun 15 16:26:15 2016 -0300

    Use correct variable to print if LZ4 support is to be built.
    
    Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>

diff --git a/configure.ac b/configure.ac
index b5054ff..375d26e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -282,7 +282,7 @@ AC_MSG_NOTICE([
         prefix:                   ${prefix}
         C compiler:               ${CC}
 
-        LZ4 support:              ${enable_lz4}
+        LZ4 support:              ${have_lz4}
         Smartcard:                ${have_smartcard}
         GStreamer:                ${enable_gstreamer}
         SASL support:             ${have_sasl}
diff --git a/spice-common b/spice-common
index 4284011..5359304 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit 4284011bdce6dd94301a2c83f4416ed3ad500881
+Subproject commit 535930471320fb370c3027c158a1944a9729ce93