[Spice-commits] 4 commits - configure.ac Makefile.am server/tests spice-common

[Marc-André Lureau]

 Makefile.am             |    2 --
 configure.ac            |    2 +-
 server/tests/.gitignore |    1 +
 spice-common            |    2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit acdb67b4d2986ed428d12ac002ef20bef739efa6
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Mon Jul 16 17:36:07 2012 +0200

    Update spice-common

diff --git a/spice-common b/spice-common
index 2449260..735e431 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit 2449260c81a6f5344214ee2a80c5566bec48aeee
+Subproject commit 735e43167195267e70559101a1b35196b59b84ca
commit 4e7f071e6ff05911446549398b249f3dd9ab44a7
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Mon Jul 16 16:12:48 2012 +0200

    tests: add missing file to .gitignore
    
    TODO: some day, switch to git.mk

diff --git a/server/tests/.gitignore b/server/tests/.gitignore
index d587e25..74687d1 100644
--- a/server/tests/.gitignore
+++ b/server/tests/.gitignore
@@ -4,3 +4,4 @@ test_empty_success
 test_just_sockets_no_ssl
 test_fail_on_null_core_interface
 test_playback
+test_display_resolution_changes
\ No newline at end of file
commit e234982a44e1cc1b8a9b7da4865517a2b7cdd7ef
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Mon Jul 16 15:09:24 2012 +0200

    build-sys: remove cegui/slirp and mandatory client from dist-check
    
    The spicec client is no longer actively maintained.
    
    By removing cegui from distcheck, we can avoid extra build time and
    dependencies (>150Mb extra cegui/boost on fedora)
    
    Slirp is not available in most distributions, afaict, making it hard
    to build consistantly accross various systems.
    
    The client is still build if the dependencies are present.

diff --git a/Makefile.am b/Makefile.am
index 6971425..50a1a38 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,7 @@ pkgconfig_DATA = spice-server.pc
 
 DISTCHECK_CONFIGURE_FLAGS =			\
 	--enable-automated-tests		\
-	--enable-gui				\
 	--enable-opengl				\
 	--enable-smartcard			\
-	--enable-tunnel				\
 	--with-sasl				\
 	$(NULL)
commit 52c3fb03b7e78b064f382390677c96b501c648a2
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Mon Jul 16 15:09:09 2012 +0200

    build-sys: define GL flags if enabled
    
    The server too can use opengl, independently from client.

diff --git a/configure.ac b/configure.ac
index 8f9474e..75a062c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -272,7 +272,7 @@ SPICE_REQUIRES+=" openssl"
 # AC_SUBST(GL_LIBS)
 # SPICE_REQUIRES+=" gl glu"
 
-if test "x$enable_opengl" = "xyes" && test "x$enable_client" = "xyes" ; then
+if test "x$enable_opengl" = "xyes"; then
    AC_CHECK_LIB(GL, glBlendFunc, GL_LIBS="$GL_LIBS -lGL", enable_opengl=no)
    AC_CHECK_LIB(GLU, gluSphere, GL_LIBS="$GL_LIBS -lGLU", enable_opengl=no)
    AC_DEFINE([USE_OPENGL], [1], [Define to build with OpenGL support])