qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix EXA detection.

Browse Source 
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.

Problem noticed by P. Graham, diagnostic by kettenis@, fix from
Connor Behan in upstreams driver
This commit is contained in:
matthieu 2016-04-04 20:09:20 +00:00
parent a096d7ad4a
commit 460dce2786
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
driver/xf86-video-r128/configure.ac
View File

@ -121,12 +121,7 @@ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
AC_MSG_CHECKING([whether to enable EXA support])
if test "x$EXA" = xyes; then
AC_MSG_RESULT(yes)
SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
AC_CHECK_HEADER(exa.h,
[have_exa_h="yes"], [have_exa_h="no"])
CPPFLAGS="$SAVE_CPPFLAGS"
AC_CHECK_FILE(${sdkdir}/exa.h, [have_exa_h="yes"], [have_exa_h="no"])
else
AC_MSG_RESULT(no)
fi
@ -136,6 +131,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!