diff options
| author | Luc Verhaegen <libv@skynet.be> | 2006-03-15 00:46:33 +0000 |
|---|---|---|
| committer | Luc Verhaegen <libv@skynet.be> | 2006-03-15 00:46:33 +0000 |
| commit | 50923b6a9325592edc8b02b17646f96b9b8c4a01 (patch) | |
| tree | 4327c18885545b34bf76b5b4bd92062e6ffea0c0 /src | |
| parent | 74f4ed4275866475b3c182fae962df2fc0946b85 (diff) | |
Add some autoconf to keep this driver from building EXA when a slightly
older server with older exa is installed.
The way in which this problem was treated by the actually related
developers explains a lot about this driver.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/radeon_driver.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d9622f9..67fff56 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,6 +41,10 @@ if ATIMISC_DGA ATIMISC_DGA_SOURCES = atidga.c endif +if USE_EXA +RADEON_EXA_SOURCES = radeon_exa.c +endif + AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ ati_drv_la_LTLIBRARIES = ati_drv.la @@ -76,7 +80,7 @@ radeon_drv_ladir = @moduledir@/drivers radeon_drv_la_SOURCES = \ radeon_accel.c radeon_mergedfb.c radeon_cursor.c radeon_dga.c \ radeon_driver.c radeon_video.c radeon_bios.c radeon_mm_i2c.c \ - radeon_vip.c radeon_misc.c radeon_exa.c $(RADEON_DRI_SRCS) + radeon_vip.c radeon_misc.c $(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) theatre_detect_drv_la_LTLIBRARIES = theatre_detect_drv.la theatre_detect_drv_la_LDFLAGS = -module -avoid-version diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 34d3c10..cb86fb8 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -1,5 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.117 2004/02/19 22:38:12 tsi Exp $ */ -/* $XdotOrg: driver/xf86-video-ati/src/radeon_driver.c,v 1.98 2006/03/12 06:53:27 benh Exp $ */ +/* $XdotOrg: driver/xf86-video-ati/src/radeon_driver.c,v 1.99 2006/03/13 00:09:44 benh Exp $ */ /* * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and * VA Linux Systems Inc., Fremont, California. @@ -4381,6 +4381,8 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn) char *optstr; #endif + info->useEXA = FALSE; + if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) { int errmaj = 0, errmin = 0; |