|
 |
e663830 |
From 6c810c964b64c0d9e4970a803718bcc4b7bd7f1c Mon Sep 17 00:00:00 2001
|
|
|
e663830 |
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
|
e663830 |
Date: Thu, 25 Apr 2019 18:03:18 +0200
|
|
|
e663830 |
Subject: [PATCH 5/5] build: fix present.h detection
|
|
|
e663830 |
|
|
|
e663830 |
With xserver 1.20.4 it's necessary to include xorg-server.h before
|
|
|
e663830 |
present.h:
|
|
|
e663830 |
|
|
|
e663830 |
In file included from /usr/include/xorg/randrstr.h:46,
|
|
|
e663830 |
from /usr/include/xorg/present.h:27,
|
|
|
e663830 |
from conftest.c:37:
|
|
|
e663830 |
/usr/include/xorg/servermd.h:51:2: error: #error Drivers must include xorg-server.h before any other xserver headers
|
|
|
e663830 |
|
|
|
e663830 |
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
|
|
|
e663830 |
---
|
|
|
e663830 |
configure.ac | 4 +++-
|
|
|
e663830 |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
e663830 |
|
|
|
e663830 |
diff --git a/configure.ac b/configure.ac
|
|
|
e663830 |
index e69e447..7d4d6fa 100644
|
|
|
e663830 |
--- a/configure.ac
|
|
|
e663830 |
+++ b/configure.ac
|
|
|
e663830 |
@@ -295,7 +295,9 @@ PKG_CHECK_MODULES(PRESENT, [presentproto >= 1.0], , PRESENT=no)
|
|
|
e663830 |
if test x$PRESENT != xno; then
|
|
|
e663830 |
save_CFLAGS=$CFLAGS
|
|
|
e663830 |
CFLAGS="$XORG_CFLAGS $PRESENT_CFLAGS"
|
|
|
e663830 |
- AC_CHECK_HEADERS([present.h], PRESENT=yes, PRESENT=no, [#include <dixstruct.h>])
|
|
|
e663830 |
+ AC_CHECK_HEADERS([present.h], PRESENT=yes, PRESENT=no,
|
|
|
e663830 |
+ [#include <xorg-server.h>]
|
|
|
e663830 |
+ [#include <dixstruct.h>])
|
|
|
e663830 |
CFLAGS=$save_CFLAGS
|
|
|
e663830 |
fi
|
|
|
e663830 |
AC_MSG_CHECKING([whether to include PRESENT support])
|
|
|
e663830 |
--
|
|
|
e663830 |
2.21.0
|
|
|
e663830 |
|