diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-11-11 15:49:44 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-11-11 15:49:44 +0000 |
| commit | a26a9fdb10a5cb05e17902d85c861e4775eb8a4c (patch) | |
| tree | 2d2b0eec655f1cdc5a4f357ea7bdf6d71e9f20d6 | |
| parent | e0ec3b3335e3f2b6461f6c9510f10dabbb381d94 (diff) | |
Make it possible to build radeon drivers without XAA.
| -rw-r--r-- | driver/xf86-video-ati/configure.ac | 23 | ||||
| -rw-r--r-- | driver/xf86-video-radeonold/configure.ac | 23 |
2 files changed, 42 insertions, 4 deletions
diff --git a/driver/xf86-video-ati/configure.ac b/driver/xf86-video-ati/configure.ac index 88769184b..947a1facb 100644 --- a/driver/xf86-video-ati/configure.ac +++ b/driver/xf86-video-ati/configure.ac @@ -163,8 +163,6 @@ fi AM_CONDITIONAL(DRM_MODE, test x$DRM_MODE = xyes) AM_CONDITIONAL(LIBUDEV, test x$LIBUDEV = xyes) -AC_DEFINE(USE_XAA, 1, [Build support for XAA]) - # Properly handle EXA. AC_MSG_CHECKING([whether to enable EXA support]) if test "x$EXA" = xyes; then @@ -246,6 +244,27 @@ if test "x$have_list_h" = xyes; then #include "list.h"]) fi +AC_ARG_ENABLE(xaa, + AS_HELP_STRING([--enable-xaa], + [Enable legacy X Acceleration Architecture (XAA) [default=auto]]), + [XAA="$enableval"], + [XAA=auto]) +if test "x$XAA" != xno; then + save_CFLAGS=$CFLAGS + save_CPPFLAGS=$CPPFLAGS + CFLAGS=$XORG_CFLAGS + CPPFLAGS="$XORG_CFLAGS" + AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no) + CFLAGS=$save_CFLAGS + CPPFLAGS=$save_CPPFLAGS +fi +AC_MSG_CHECKING([whether to include XAA support]) +AM_CONDITIONAL(XAA, test "x$XAA" = xyes) +if test "x$XAA" = xyes; then + AC_DEFINE(USE_XAA, test "x$XAA" = xyes, [Build support for XAA]) +fi +AC_MSG_RESULT([$XAA]) + CPPFLAGS="$SAVE_CPPFLAGS" AM_CONDITIONAL(USE_EXA, test "x$USE_EXA" = xyes) diff --git a/driver/xf86-video-radeonold/configure.ac b/driver/xf86-video-radeonold/configure.ac index 4c3ec7ccb..76368dc4b 100644 --- a/driver/xf86-video-radeonold/configure.ac +++ b/driver/xf86-video-radeonold/configure.ac @@ -121,8 +121,6 @@ CFLAGS="$XORG_CFLAGS" AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"]) CFLAGS="$save_CFLAGS" -AC_DEFINE(USE_XAA, 1, [Build support for XAA]) - # Properly handle EXA. AC_MSG_CHECKING([whether to enable EXA support]) if test "x$EXA" = xyes; then @@ -199,6 +197,27 @@ if test "x$XSERVER_SOURCE" = x; then fi fi +AC_ARG_ENABLE(xaa, + AS_HELP_STRING([--enable-xaa], + [Enable legacy X Acceleration Architecture (XAA) [default=auto]]), + [XAA="$enableval"], + [XAA=auto]) +if test "x$XAA" != xno; then + save_CFLAGS=$CFLAGS + save_CPPFLAGS=$CPPFLAGS + CFLAGS=$XORG_CFLAGS + CPPFLAGS="$XORG_CFLAGS" + AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no) + CFLAGS=$save_CFLAGS + CPPFLAGS=$save_CPPFLAGS +fi +AC_MSG_CHECKING([whether to include XAA support]) +AM_CONDITIONAL(XAA, test "x$XAA" = xyes) +if test "x$XAA" = xyes; then + AC_DEFINE(USE_XAA, test "x$XAA" = xyes, [Build support for XAA]) +fi +AC_MSG_RESULT([$XAA]) + if test -d "$XSERVER_SOURCE"; then case "$XSERVER_SOURCE" in /*) |