diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-09-23 13:40:04 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-09-23 13:41:55 +0100 |
| commit | 9326acc2917109f06dda809107c8fa5a2273c3d2 (patch) | |
| tree | 6f22af106f3ee776eddf23f0251ad643fb1b2340 /configure.ac | |
| parent | 0afb7efe8c48b5fc839e2137e870bea0f5fb3c9c (diff) | |
Allow compilation of a separate i810 driver
Allow --enable-ums-only as a counter-option to --enable-kms-only in case
the distribution wishes to enable a non-root KMS driver but also offer
a separate UMS driver for i81x.
On the second pass, use "--enable-ums-only --disable-uxa --disable-sna"
to get the trimmed down unaccelerated i810 support.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 6b0b0a8b..1cd5a92c 100644 --- a/configure.ac +++ b/configure.ac @@ -125,6 +125,10 @@ AC_ARG_ENABLE(kms-only, AS_HELP_STRING([--enable-kms-only], [Assume KMS support [[default=no]]]), [KMS_ONLY="$enableval"], [KMS_ONLY=no]) +AC_ARG_ENABLE(ums-only, AS_HELP_STRING([--enable-ums-only], + [Assume only UMS (no KMS) support [[default=no]]]), + [UMS_ONLY="$enableval"], + [UMS_ONLY=no]) required_xorg_xserver_version=1.6 required_pixman_version=0.24 @@ -230,12 +234,12 @@ if test "x$accel" = xauto; then accel=sna fi fi - if test "x$accel" = xauto; then + if test "x$accel" = xauto -a "x$UMS_ONLY" != "xyes"; then AC_MSG_ERROR([No default acceleration option]) fi fi -have_accel=no +have_accel=none if test "x$accel" = xsna; then if test "x$SNA" != "xno"; then AC_DEFINE(DEFAULT_ACCEL_METHOD, SNA, [Default acceleration method]) @@ -254,7 +258,7 @@ if test "x$accel" = xuxa; then fi fi AC_MSG_RESULT($accel) -if test "x$accel" = xno; then +if test "x$accel" = xnone -a "x$UMS_ONLY" != "xyes"; then AC_MSG_ERROR([No default acceleration option]) fi @@ -361,6 +365,10 @@ AM_CONDITIONAL(KMS_ONLY, test x$KMS_ONLY = xyes) if test "x$KMS_ONLY" = xyes; then AC_DEFINE(KMS_ONLY,1,[Assume KMS support]) fi +AM_CONDITIONAL(UMS_ONLY, test x$UMS_ONLY = xyes) +if test "x$UMS_ONLY" = xyes; then + AC_DEFINE(UMS_ONLY,1,[Assume only UMS (no KMS) support]) +fi AM_CONDITIONAL(DEBUG, test x$DEBUG != xno) AM_CONDITIONAL(FULL_DEBUG, test x$FULL_DEBUG == xfull) |