xserver: Branch 'server-1.18-branch'

[Adam Jackson]

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

New commits:
commit bc4b234d6f4b7b211f7a9750a97524e9652d0e6e
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jan 27 11:50:13 2016 -0500

    modesetting: Require sufficiently new libdrm
    
    Bugzilla: https://bugs.freedesktop.org/93883
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Reviewed-by: Julien Cristau <jcristau at debian.org>
    (cherry picked from commit bf23db42a4e5943129501223a47b48884cdeb62f)

diff --git a/configure.ac b/configure.ac
index 070b63a..a9b6954 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2035,8 +2035,7 @@ if test "x$XORG" = xyes; then
 
 	if test "x$DRM" = xyes; then
 		dnl 2.4.46 is required for cursor hotspot support.
-		PKG_CHECK_EXISTS(libdrm >= 2.4.46)
-		XORG_DRIVER_MODESETTING=yes
+		PKG_CHECK_EXISTS(libdrm >= 2.4.46, XORG_DRIVER_MODESETTING=yes, XORG_DRIVER_MODESETTING=no)
 	fi
 
 	AC_SUBST([XORG_LIBS])