xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit 334f1107146a2e6ebf6f7743b77aec2ad5c46f75
Author: Alexander Tsoy <alexander at tsoy.me>
Date:   Mon Sep 23 18:23:40 2019 +0300

    configure: Set libdrm flags correctly if only XORG is enabled
    
    This fixes modesetting driver build failure which can be triggered with
    the following configure options:
    
    $ ./configure --disable-dri --disable-dri2 --disable-dri3
    --disable-config-udev --enable-xorg
    
    Bugzilla: https://bugs.gentoo.org/689768
    Signed-off-by: Alexander Tsoy <alexander at tsoy.me>
    Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

diff --git a/configure.ac b/configure.ac
index 969090b94..268c82fda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1237,7 +1237,7 @@ esac
 
 AM_CONDITIONAL(DRI3, test "x$DRI3" = xyes)
 
-if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes; then
+if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes || test "x$XORG" = xyes; then
 	if test "x$DRM" = xyes; then
 		AC_DEFINE(WITH_LIBDRM, 1, [Building with libdrm support])
 		PKG_CHECK_MODULES([LIBDRM], $LIBDRM)