diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-07-10 00:32:13 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-10 09:32:01 +0100 |
| commit | 78dc0c04745ad4485b994f67833f4a155749f01d (patch) | |
| tree | 361f33026ecf0a467d68c2ad7ba96fa4c3c8b925 /configure.ac | |
| parent | 45ab003a5860fd4290df24739d2520fddfe27a8f (diff) | |
i810: Make XAA optional
Don't build XAA when it's not available, or when we don't want it.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 7ab7ab86..15ed9b97 100644 --- a/configure.ac +++ b/configure.ac @@ -158,6 +158,29 @@ if test "x$GLAMOR" != "xno"; then AC_DEFINE(USE_GLAMOR, 1, [Enable glamor acceleration]) fi + +PKG_CHECK_MODULES(XORG, [xorg-server >= $required_xorg_xserver_version xproto fontsproto pixman-1 >= $required_pixman_version $REQUIRED_MODULES]) + + +AC_MSG_CHECKING([whether to include XAA support]) +AC_ARG_ENABLE(xaa, + AS_HELP_STRING([--enable-xaa], + [Enable legacy X Acceleration Architecture (XAA) [default=auto]]), + [XAA="$enableval"], + [XAA=auto]) +AC_MSG_RESULT([$XAA]) +AM_CONDITIONAL(XAA, test "x$XAA" != xno) +if test "x$XAA" != xno; then + save_CFLAGS=$CFLAGS + CFLAGS=$XSERVER_CFLAGS + AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no) + CFLAGS=$save_CFLAGS +fi +if test "x$XAA" = xyes; then + AC_DEFINE(USE_XAA, 1, [Enable XAA support]) +fi +AM_CONDITIONAL(XAA, test "x$XAA" = xyes) + AC_ARG_WITH(default-accel, AS_HELP_STRING([--with-default-accel], [Select the default acceleration method [default=uxa if enabled, otherwise sna]]), @@ -247,7 +270,6 @@ XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto x11) XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Obtain compiler/linker options for the driver dependencies -PKG_CHECK_MODULES(XORG, [xorg-server >= $required_xorg_xserver_version xproto fontsproto pixman-1 >= $required_pixman_version $REQUIRED_MODULES]) PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.24]) # libdrm_intel is checked separately PKG_CHECK_MODULES(DRI, [xf86driproto], , DRI=no) PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6],, DRI2=no) |