diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-11-23 17:50:37 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-11-23 19:56:06 -0500 |
| commit | c0a4a2528dbaba95fec181552ccb0f00e1ede2ea (patch) | |
| tree | 9188e211d831800eb996011576fdaf9efdd6f6d4 | |
| parent | 33edd3514fbfbd8b36a8568dbe021d0df99e6743 (diff) | |
Make ISA optional
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/apm_driver.c | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 9363fca..d8ca647 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,14 @@ INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS "'-I$(top_srcdir)/src -I$(prefix AC_SUBST([CFLAGS]) AC_SUBST([INCLUDES]) +save_CFLAGS="$CFLAGS" +CFLAGS="$XORG_CFLAGS" +AC_CHECK_DECL(xf86ConfigIsaEntity, + [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])], + [], + [#include "xf86.h"]) +CFLAGS="$save_CFLAGS" + # Checks for libraries. SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" diff --git a/src/apm_driver.c b/src/apm_driver.c index 443c191..cbb2f43 100644 --- a/src/apm_driver.c +++ b/src/apm_driver.c @@ -82,10 +82,12 @@ static PciChipsets ApmPciChipsets[] = { { -1, -1, RES_UNDEFINED } }; +#ifdef HAVE_ISA static IsaChipsets ApmIsaChipsets[] = { { PCI_CHIP_AP6422, RES_EXCLUSIVE_VGA}, {-1, RES_UNDEFINED} }; +#endif typedef enum { OPTION_SET_MCLK, @@ -328,6 +330,7 @@ ApmAvailableOptions(int chipid, int busid) return ApmOptions; } +#ifdef HAVE_ISA static int ApmFindIsaDevice(GDevPtr dev) { @@ -376,6 +379,7 @@ ApmFindIsaDevice(GDevPtr dev) return apmChip; } +#endif static void ApmAssignFPtr(ScrnInfoPtr pScrn) @@ -447,6 +451,7 @@ ApmProbe(DriverPtr drv, int flags) } } +#ifdef HAVE_ISA /* Check for non-PCI cards */ numUsed = xf86MatchIsaInstances(APM_NAME, ApmChipsets, ApmIsaChipsets, drv, ApmFindIsaDevice, DevSections, @@ -467,6 +472,8 @@ ApmProbe(DriverPtr drv, int flags) } } } +#endif + xfree(DevSections); return foundScreen; } |