diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 19 | ||||
| -rw-r--r-- | src/glamo-driver.c | 8 |
2 files changed, 19 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a1e8d0a..59e88a9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -pedantic -Wall -Werror -std=gnu99 glamo_drv_la_LTLIBRARIES = glamo_drv.la -glamo_drv_la_LDFLAGS = -module -avoid-version -ldrm -ldrm_glamo +glamo_drv_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@ glamo_drv_ladir = @moduledir@/drivers glamo_drv_la_SOURCES = \ @@ -35,10 +35,13 @@ glamo_drv_la_SOURCES = \ glamo-draw.c \ glamo-display.c \ glamo-output.c \ - glamo-engine.c \ - glamo-kms-driver.c \ - glamo-kms-crtc.c \ - glamo-kms-output.c \ - glamo-dri2.c \ - glamo-kms-exa.c \ - glamo-drm.c + glamo-engine.c + +if ENABLE_KMS +glamo_drv_la_SOURCES += glamo-kms-driver.c \ + glamo-kms-crtc.c \ + glamo-kms-output.c \ + glamo-dri2.c \ + glamo-kms-exa.c \ + glamo-drm.c +endif diff --git a/src/glamo-driver.c b/src/glamo-driver.c index 17b661e..283825e 100644 --- a/src/glamo-driver.c +++ b/src/glamo-driver.c @@ -325,6 +325,8 @@ GlamoFbdevProbe(DriverPtr drv, GDevPtr *devSections, int numDevSections) return foundScreen; } +#ifdef ENABLE_KMS + static Bool GlamoKMSProbe(DriverPtr drv, GDevPtr *devSections, int numDevSections) { @@ -367,6 +369,8 @@ GlamoKMSProbe(DriverPtr drv, GDevPtr *devSections, int numDevSections) return foundScreen; } +#endif /* ENABLE_KMS */ + static Bool GlamoProbe(DriverPtr drv, int flags) { @@ -384,11 +388,15 @@ GlamoProbe(DriverPtr drv, int flags) if (numDevSections <= 0) return FALSE; /* Is today a good day to use KMS? */ +#ifdef ENABLE_KMS if ( GlamoKernelModesettingAvailable() ) { foundScreen = GlamoKMSProbe(drv, devSections, numDevSections); } else { foundScreen = GlamoFbdevProbe(drv, devSections, numDevSections); } +#else /* ENABLE_KMS */ + foundScreen = GlamoFbdevProbe(drv, devSections, numDevSections); +#endif /* ENABLE_KMS */ xfree(devSections); TRACE("probe done"); |