[Spice-commits] 4 commits - common/Makefile.am m4/spice-deps.m4

[Christophe Fergau]

 common/Makefile.am |    2 +-
 m4/spice-deps.m4   |   14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit d8c3568a3160aa3dfcd1d3b7728360c33d2d6911
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Oct 14 10:45:20 2015 +0200

    build-sys: Rename SUPPORT_GL to HAVE_GL
    
    The other conditionals are using the HAVE_ prefix, using HAVE_GL rather
    than SUPPORT_GL improves consistency.

diff --git a/common/Makefile.am b/common/Makefile.am
index 2be512c..7382509 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -79,7 +79,7 @@ libspice_common_server_la_SOURCES =		\
 
 libspice_common_server_la_CFLAGS = -DFIXME_SERVER_SMARTCARD
 
-if SUPPORT_GL
+if HAVE_GL
 libspice_common_la_SOURCES +=		\
 	gl_utils.h			\
 	glc.c				\
diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4
index 2ebdb23..59744d2 100644
--- a/m4/spice-deps.m4
+++ b/m4/spice-deps.m4
@@ -103,7 +103,7 @@ AC_DEFUN([SPICE_CHECK_OPUS], [
 # support, and checks if the needed libraries are available. If found, it will
 # return the flags to use in the GL_CFLAGS and GL_LIBS variables, and
 # it will define USE_OPENGL and GL_GLEXT_PROTOTYPES preprocessor symbol as well
-# as a SUPPORT_GL Makefile conditional.
+# as a HAVE_GL Makefile conditional.
 # ------------------
 AC_DEFUN([SPICE_CHECK_OPENGL], [
     AC_ARG_ENABLE([opengl],
@@ -111,7 +111,7 @@ AC_DEFUN([SPICE_CHECK_OPENGL], [
                        [Enable opengl support (not recommended) @<:@default=no@:>@]),
         [],
         [enable_opengl="no"])
-    AM_CONDITIONAL(SUPPORT_GL, test "x$enable_opengl" = "xyes")
+    AM_CONDITIONAL(HAVE_GL, test "x$enable_opengl" = "xyes")
 
     if test "x$enable_opengl" = "xyes"; then
         AC_CHECK_LIB(GL, glBlendFunc, GL_LIBS="$GL_LIBS -lGL", enable_opengl=no)
commit f77805773f1cee4164569ecd92838cead36aac22
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Oct 14 10:47:13 2015 +0200

    build-sys: Set automake conditional in SPICE_CHECK_SMARTCARD
    
    spice-server will use this.

diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4
index 6c5f408..2ebdb23 100644
--- a/m4/spice-deps.m4
+++ b/m4/spice-deps.m4
@@ -33,8 +33,9 @@ AC_DEFUN([SPICE_CHECK_SYSDEPS], [
 # Adds a --enable-smartcard switch in order to enable/disable smartcard
 # support, and checks if the needed libraries are available. If found, it will
 # return the flags to use in the SMARTCARD_CFLAGS and SMARTCARD_LIBS variables, and
-# it will define a USE_SMARTCARD preprocessor symbol.
-#----------------------
+# it will define a USE_SMARTCARD preprocessor symbol as well as a HAVE_SMARTCARD
+# Makefile conditional.
+----------------------
 AC_DEFUN([SPICE_CHECK_SMARTCARD], [
     AC_ARG_ENABLE([smartcard],
       AS_HELP_STRING([--enable-smartcard=@<:@yes/no/auto@:>@],
@@ -52,6 +53,7 @@ AC_DEFUN([SPICE_CHECK_SMARTCARD], [
         AC_DEFINE(USE_SMARTCARD, [1], [Define if supporting smartcard proxying])
       fi
     fi
+    AM_CONDITIONAL(HAVE_SMARTCARD, test "x$have_smartcard" = "xyes")
 ])
 
 
commit 986ad88c284dd886510f13818665688f188dcb39
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Oct 14 10:44:21 2015 +0200

    build-sys: Fix error in SPICE_CHECK_LZ4 description
    
    This macro does not define a SUPPORT_LZ4 automake conditional.

diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4
index 07cb183..6c5f408 100644
--- a/m4/spice-deps.m4
+++ b/m4/spice-deps.m4
@@ -169,7 +169,7 @@ AC_DEFUN([SPICE_CHECK_PYTHON_MODULES], [
 # Adds a --enable-lz4 switch in order to enable/disable LZ4 compression
 # support, and checks if the needed libraries are available. If found, it will
 # return the flags to use in the LZ4_CFLAGS and LZ4_LIBS variables, and
-# it will define a USE_LZ4 preprocessor symbol as well as a SUPPORT_LZ4 Makefile
+# it will define a USE_LZ4 preprocessor symbol.
 # conditional.
 # ---------------
 AC_DEFUN([SPICE_CHECK_LZ4], [
commit 04ed3b8cbe583b85e9bbb6cd48be36c4f434a65b
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Fri Oct 23 13:52:05 2015 +0200

    build-sys: Add gio-2.0 to SPICE_CHECK_GLIB2
    
    GInetAddress is defined in gio, not glib. Not checking for gio-2.0 in
    SPICE_CHECK_GLIB2 means gio won't be in GLIB2_LIBS, which causes link
    errors when trying to build spice-server.

diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4
index bcd6f98..07cb183 100644
--- a/m4/spice-deps.m4
+++ b/m4/spice-deps.m4
@@ -140,7 +140,7 @@ AC_DEFUN([SPICE_CHECK_PIXMAN], [
 # use in the GLIB2_CFLAGS and GLIB2_LIBS variables.
 #------------------
 AC_DEFUN([SPICE_CHECK_GLIB2], [
-    PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.22)
+    PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.22 gio-2.0 >= 2.22)
 ])
 
 # SPICE_CHECK_PYTHON_MODULES()