summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2019-04-26 10:49:07 +0200
committerRussell King <rmk@armlinux.org.uk>2019-05-18 17:53:56 +0100
commit34a7272573431a9a0fabb94012f902198a3ac9a7 (patch)
treeb643db418341f661c872413b724b538f26eef501
parentcd437ecc155049361b221c46f43f8acd36c761c2 (diff)
build: fix present.h detectionunstable-devel
With xserver 1.20.4 it's necessary to include xorg-server.h before present.h: In file included from /usr/include/xorg/randrstr.h:46, from /usr/include/xorg/present.h:27, from conftest.c:37: /usr/include/xorg/servermd.h:51:2: error: #error Drivers must include xorg-server.h before any other xserver headers Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> Signed-off-by: Russell King <rmk@armlinux.org.uk>
-rw-r--r--configure.ac4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index c417c46..22ed76e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -296,7 +296,9 @@ PKG_CHECK_MODULES(PRESENT, [presentproto >= 1.0], , PRESENT=no)
if test x$PRESENT != xno; then
save_CFLAGS=$CFLAGS
CFLAGS="$XORG_CFLAGS $PRESENT_CFLAGS"
- AC_CHECK_HEADERS([present.h], PRESENT=yes, PRESENT=no, [#include <dixstruct.h>])
+ AC_CHECK_HEADERS([present.h], PRESENT=yes, PRESENT=no,
+ [#include <xorg-server.h>]
+ [#include <dixstruct.h>])
CFLAGS=$save_CFLAGS
fi
AC_MSG_CHECKING([whether to include PRESENT support])