Make compiling with DRI support configurable/autodetecable. Autodetect DRI

    sdk headers. Expand help string for xorg-module-dir option.

1 files changed, 11 insertions, 7 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 6659408d..6b44742e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,11 @@
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 
-AM_CFLAGS = -DXF86DRI -DXF86DRI_DEVEL
+if DRI
+ATIMISC_DRI_SRCS = atidri.c
+R128_DRI_SRCS = r128_dri.c
+RADEON_DRI_SRCS = radeon_dri.c
+endif
 
 ati_drv_la_LTLIBRARIES = ati_drv.la
 ati_drv_la_LDFLAGS = -module -avoid-version
@@ -34,26 +38,26 @@ ati_drv_ladir = @moduledir@/drivers
 ati_drv_la_SOURCES = \
 	ati.c atiadapter.c atibus.c atichip.c atiident.c atioption.c \
 	atiprobe.c atividmem.c ativgaio.c atimodule.c \
-        radeon_probe.c r128_probe.c
+	radeon_probe.c r128_probe.c
 
 atimisc_drv_la_LTLIBRARIES = atimisc_drv.la
 atimisc_drv_la_LDFLAGS = -module -avoid-version
 atimisc_drv_ladir = @moduledir@/drivers
 atimisc_drv_la_SOURCES = \
 	atiaccel.c atiadjust.c atiaudio.c aticlock.c aticonfig.c aticonsole.c \
-        aticursor.c atidac.c atidecoder.c atidsp.c atifillin.c atii2c.c \
+	aticursor.c atidac.c atidecoder.c atidsp.c atifillin.c atii2c.c \
 	atilock.c atimach64.c atimach64accel.c atimach64cursor.c \
 	atimach64i2c.c atimach64io.c atimach64xv.c atimode.c atipreinit.c \
 	atiprint.c atirgb514.c atiscreen.c atituner.c atiutil.c ativalid.c \
-        atixv.c atidri.c atibank.c ativga.c atiwonder.c atiwonderio.c \
-	atidga.c atiload.c atimisc.c
+	atixv.c atibank.c ativga.c atiwonder.c atiwonderio.c atidga.c \
+	atiload.c atimisc.c $(ATIMISC_DRI_SRCS) 
 
 r128_drv_la_LTLIBRARIES = r128_drv.la
 r128_drv_la_LDFLAGS = -module -avoid-version
 r128_drv_ladir = @moduledir@/drivers
 r128_drv_la_SOURCES = \
 	r128_accel.c r128_cursor.c r128_dga.c r128_driver.c \
-        r128_video.c r128_dri.c r128_misc.c
+	r128_video.c r128_misc.c $(R128_DRI_SRCS)
 
 radeon_drv_la_LTLIBRARIES = radeon_drv.la
 radeon_drv_la_LDFLAGS = -module -avoid-version
@@ -61,7 +65,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_dri.c radeon_misc.c
+	radeon_vip.c radeon_misc.c $(RADEON_DRI_SRCS)
 
 theatre_detect_drv_la_LTLIBRARIES = theatre_detect_drv.la
 theatre_detect_drv_la_LDFLAGS = -module -avoid-version