42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
|
From 58b60cdad9fb201eb097777d6f1d17b5ccd9403a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Adam Jackson <ajax@redhat.com>
|
||
|
|
Date: Wed, 10 Feb 2021 14:49:48 -0500
|
||
|
|
Subject: [PATCH] configure: Simplify fragile libdrm detection
|
||
|
|
|
||
|
|
libdrm 2.4.46 always installs qxl_drm.h
|
||
|
|
---
|
||
|
|
configure.ac | 8 +-------
|
||
|
|
1 file changed, 1 insertion(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index e367558..d3e5f50 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -76,11 +76,6 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
|
||
|
|
[#include "xorg-server.h"])
|
||
|
|
CFLAGS="$save_CFLAGS"
|
||
|
|
|
||
|
|
-save_CFLAGS="$CFLAGS"
|
||
|
|
-CFLAGS="$XORG_CFLAGS"
|
||
|
|
-AC_CHECK_HEADER(qxl_drm.h,[QXL_DRM=yes],[QXL_DRM=no],[#include <stdint.h>])
|
||
|
|
-CFLAGS="$save_CFLAGS"
|
||
|
|
-
|
||
|
|
AC_ARG_ENABLE(kms,
|
||
|
|
AS_HELP_STRING([--disable-kms],
|
||
|
|
[Disable KMS support [[default=enabled]]]),
|
||
|
|
@@ -88,10 +83,9 @@ AC_ARG_ENABLE(kms,
|
||
|
|
[DRM_MODE=yes])
|
||
|
|
|
||
|
|
# Checks for libraries.
|
||
|
|
-if test "x$QXL_DRM" = xyes && test "x$DRM_MODE" = xyes; then
|
||
|
|
+if test "x$DRM_MODE" = xyes; then
|
||
|
|
# require support for kms cursor hotspot
|
||
|
|
PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.46])
|
||
|
|
-
|
||
|
|
else
|
||
|
|
DRM_MODE=no
|
||
|
|
fi
|
||
|
|
--
|
||
|
|
2.26.2
|
||
|
|
|