xserver: Branch 'master'

[Adam Jackson]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8510f542e5474b719f7d7edba7ef0cc05af0271e
Author: Alexander Volkov <a.volkov at rusbitech.ru>
Date:   Wed Feb 7 14:08:50 2018 +0300

    Xephyr: Require xcb-shm version 1.9.3 or newer
    
    It's needed for FD-passing.
    
    Signed-off-by: Alexander Volkov <a.volkov at rusbitech.ru>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/configure.ac b/configure.ac
index 98b8ea2ed..9e498e662 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2305,7 +2305,7 @@ XEPHYR_INCS=
 AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes])
 
 if test "$KDRIVE" = yes; then
-    XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9 xcb-keysyms xcb-randr xcb-xkb"
+    XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3 xcb-keysyms xcb-randr xcb-xkb"
     if test "x$XV" = xyes; then
         XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xcb-xv"
     fi