diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-11-23 17:28:33 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-11-23 17:28:33 -0500 |
| commit | d994a9abbda582ccd6d38447ca2201de10cc36a5 (patch) | |
| tree | cfb0c11363c6fb66e498c201648dbbd948048092 | |
| parent | 38431c99ccb625d0fd784f86f6a8a9cdbfbf872e (diff) | |
| download | xorg-driver-xf86-video-vesa-d994a9abbda582ccd6d38447ca2201de10cc36a5.tar.gz | |
Make ISA support optional.
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/vesa.c | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 027a5cf..de2456a 100644 --- a/configure.ac +++ b/configure.ac @@ -58,6 +58,14 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server) save_CFLAGS="$CFLAGS" CFLAGS="$XORG_CFLAGS" +AC_CHECK_DECL(xf86ConfigIsaEntity, + [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])], + [], + [#include "xf86.h"]) +CFLAGS="$save_CFLAGS" + +save_CFLAGS="$CFLAGS" +CFLAGS="$XORG_CFLAGS" AC_CHECK_DECL(XSERVER_LIBPCIACCESS, [XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no], [#include "xorg-server.h"]) @@ -138,10 +138,12 @@ static PciChipsets VESAPCIchipsets[] = { }; #endif +#ifdef HAVE_ISA static IsaChipsets VESAISAchipsets[] = { {CHIP_VESA_GENERIC, RES_EXCLUSIVE_VGA}, {-1, 0 } }; +#endif /* @@ -446,6 +448,7 @@ VESAProbe(DriverPtr drv, int flags) } #endif +#ifdef HAVE_ISA /* Isa Bus */ numUsed = xf86MatchIsaInstances(VESA_NAME,VESAChipsets, VESAISAchipsets, drv, @@ -465,12 +468,14 @@ VESAProbe(DriverPtr drv, int flags) } xfree(usedChips); } +#endif xfree(devSections); return (foundScreen); } +#ifdef HAVE_ISA static int VESAFindIsaDevice(GDevPtr dev) { @@ -495,6 +500,7 @@ VESAFindIsaDevice(GDevPtr dev) #endif return (int)CHIP_VESA_GENERIC; } +#endif static void VESAFreeRec(ScrnInfoPtr pScrn) |