[Spice-commits] 2 commits - configure.ac .gitignore server/tests

[Frediano Ziglio]

 .gitignore              |    1 +
 configure.ac            |    2 +-
 server/tests/.gitignore |    1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2306c364d23e2a849c86ebf8b76f7ffa34be6586
Author: Michal Privoznik <mprivozn at redhat.com>
Date:   Wed Feb 24 17:13:27 2016 +0100

    Update .gitignore files
    
    The first part updates the .gitignore file in the root directory
    because the file is obviously generated by automake but poison
    our working tree.
    The second part updates the .gitignore under server/tests/
    directory because since 0db1137d we have a noinst test library
    libtest.a. However, like in previous case, git should never track
    this file.
    
    Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/.gitignore b/.gitignore
index eb35f4b..90fb62a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ Makefile
 Makefile.in
 spice-server.pc
 stamp-h1
+test-driver
 INSTALL
 .version
 .tarball-version
diff --git a/server/tests/.gitignore b/server/tests/.gitignore
index 17ffa2c..3b4544f 100644
--- a/server/tests/.gitignore
+++ b/server/tests/.gitignore
@@ -14,3 +14,4 @@ libstat_test1.a
 libstat_test2.a
 libstat_test3.a
 libstat_test4.a
+libtest.a
commit 97acfd6f3e9c05095cdc5d311b28a51bad0ed844
Author: Michal Privoznik <mprivozn at redhat.com>
Date:   Wed Feb 24 17:13:11 2016 +0100

    configure: Require spice-protocol-0.12.11 at least
    
    After 7a06efde we require SPICE_MSG_DISPLAY_GL_SCANOUT_UNIX
    symbol from spice-protocol (or value to be more precise). This
    has been however introduced in version 0.12.11 of the
    spice-protocol (commit 3fc2221e there). However, our configure
    check does not reflect this change. Fix it.
    
    Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/configure.ac b/configure.ac
index 3396c71..f5445c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,7 +99,7 @@ AS_IF([test x"$have_smartcard" = "xyes"], [
     AS_VAR_APPEND([SPICE_REQUIRES], [" libcacard >= 0.1.2"])
 ])
 
-SPICE_PROTOCOL_MIN_VER=0.12.10
+SPICE_PROTOCOL_MIN_VER=0.12.11
 PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= $SPICE_PROTOCOL_MIN_VER])
 AC_SUBST([SPICE_PROTOCOL_MIN_VER])