xf86-video-mach64: Branch 'master'

[GitLab Mirror]

 configure.ac |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 37498721a520cd1cff367bc36b1ac74b343826ca
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Jul 5 11:01:56 2019 +0200

    configure: Include xorg-server.h before exa.h
    
    Fixes EXA detection spuriously failing with current xserver.

diff --git a/configure.ac b/configure.ac
index 3bcb320..1b31139 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,7 +169,8 @@ if test "x$EXA" = xyes; then
         SAVE_CPPFLAGS="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
         AC_CHECK_HEADER(exa.h,
-                       [have_exa_h="yes"], [have_exa_h="no"])
+                       [have_exa_h="yes"], [have_exa_h="no"],
+                       [#include <xorg-server.h>])
         CPPFLAGS="$SAVE_CPPFLAGS"
 else
         AC_MSG_RESULT(no)
@@ -180,7 +181,8 @@ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
 if test "x$have_exa_h" = xyes; then
         AC_MSG_CHECKING([whether EXA version is at least 2.0.0])
         AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
-#include "exa.h"
+#include <xorg-server.h>
+#include <exa.h>
 #if EXA_VERSION_MAJOR < 2
 #error OLD EXA!
 #endif