Fix EXA detection.

As of 1.17.2, the xserver is more picky about the order in which
headers are included. We need to account for this in order for the
compile time exa.h check to succeed.

Patch from Matthew Rezny upstreams.
This commit is contained in:
matthieu
2016-04-04 20:37:58 +00:00
parent 008bc27715
commit fc8dc9fdc2

View File

@@ -159,7 +159,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)
@@ -170,6 +171,7 @@ 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 "xorg-server.h"
#include "exa.h"
#if EXA_VERSION_MAJOR < 2
#error OLD EXA!