xserver: Branch 'master'

[Michel Dänzer]

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

New commits:
commit ad6689b7db0a4b0d22716acedae98462a68ea1ae
Author: Mariusz Bialonczyk <manio at skyboo.net>
Date:   Fri Mar 17 11:20:22 2017 +0100

    configure.ac: fix checking for libdrm version after 9232835bd
    
    No matter what libdrm version was installed, it always set
    the GLAMOR_HAS_DRM_NAME_FROM_FD_2 conditional to 1.
    This obviously leads to compilation problems.
    
    Fixes: 9232835bd16b ("glamor: use drmGetDeviceNameFromFD2 when available")
    Signed-off-by: Mariusz Bialonczyk <manio at skyboo.net>
    Reviewed-and-Tested-by: Qiang Yu <Qiang.Yu at amd.com>

diff --git a/configure.ac b/configure.ac
index ac11e6572..da08a2a4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2167,8 +2167,9 @@ if test "x$GLAMOR" = xyes; then
 		fi
 	fi
 
-	PKG_CHECK_MODULES(LIBDRM, "libdrm >= 2.4.74",
-			[AC_DEFINE(GLAMOR_HAS_DRM_NAME_FROM_FD_2, 1, [Have GLAMOR_HAS_DRM_NAME_FROM_FD_2])], [])
+	PKG_CHECK_EXISTS(libdrm >= 2.4.74,
+			 [AC_DEFINE(GLAMOR_HAS_DRM_NAME_FROM_FD_2, 1, [Have GLAMOR_HAS_DRM_NAME_FROM_FD_2])],
+			 [])
 fi
 AM_CONDITIONAL([GLAMOR_EGL], [test "x$GBM" = xyes])