diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-11-23 17:30:45 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-11-23 20:11:31 -0500 |
| commit | 73cbaec34866524deab838d04876408bbc93a102 (patch) | |
| tree | 7f35ad19f9b1b12e94d9dedfa96f4312a59080f1 | |
| parent | 7119ae2424d7fea8eb67586be4ea9982000dcc3a (diff) | |
Make ISA optional
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/trident_driver.c | 8 |
2 files changed, 15 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e0b3b18..a130ed3 100644 --- a/configure.ac +++ b/configure.ac @@ -58,6 +58,14 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) 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_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" AC_CHECK_DECL(XSERVER_LIBPCIACCESS, diff --git a/src/trident_driver.c b/src/trident_driver.c index 9d2fdb4..5d0e818 100644 --- a/src/trident_driver.c +++ b/src/trident_driver.c @@ -173,6 +173,7 @@ static SymTabRec TRIDENTChipsets[] = { { -1, NULL } }; +#ifdef HAVE_ISA static IsaChipsets TRIDENTISAchipsets[] = { { TVGA9000, RES_EXCLUSIVE_VGA }, { TVGA9000i, RES_EXCLUSIVE_VGA }, @@ -184,6 +185,7 @@ static IsaChipsets TRIDENTISAchipsets[] = { { TGUI9440AGi, RES_EXCLUSIVE_VGA }, { -1, RES_UNDEFINED } }; +#endif static PciChipsets TRIDENTPciChipsets[] = { { CYBER9320, PCI_CHIP_9320, RES_SHARED_VGA }, @@ -808,6 +810,7 @@ TRIDENTClockSelect(ScrnInfoPtr pScrn, int no) return(TRUE); } +#ifdef HAVE_ISA static int TridentFindIsaDevice(GDevPtr dev) { @@ -898,6 +901,7 @@ TridentFindIsaDevice(GDevPtr dev) } return found; } +#endif /* Mandatory */ @@ -974,6 +978,7 @@ TRIDENTProbe(DriverPtr drv, int flags) } } +#ifdef HAVE_ISA /* Isa Bus */ numUsed = xf86MatchIsaInstances(TRIDENT_NAME,TRIDENTChipsets, TRIDENTISAchipsets, @@ -1004,7 +1009,8 @@ TRIDENTProbe(DriverPtr drv, int flags) } xfree(usedChips); } - +#endif + xfree(devSections); return foundScreen; } |