diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-04-04 20:23:33 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-04-04 20:23:33 +0000 |
| commit | 2838a807ec6371b5b251a3bef6862cea073ca63c (patch) | |
| tree | 82a8e017a9c446a8e4966b22cba70da68ddde731 /driver/xf86-video-mach64 | |
| parent | 0a445ccd2cd8b0271fdcf77b8acb072efdee87de (diff) | |
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.
Diffstat (limited to 'driver/xf86-video-mach64')
| -rw-r--r-- | driver/xf86-video-mach64/configure.ac | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/driver/xf86-video-mach64/configure.ac b/driver/xf86-video-mach64/configure.ac index 830c25eb9..b1fbca5a3 100644 --- a/driver/xf86-video-mach64/configure.ac +++ b/driver/xf86-video-mach64/configure.ac @@ -166,12 +166,7 @@ fi 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 @@ -181,6 +176,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! |