diff options
| author | Keith Packard <keithp@keithp.com> | 2008-11-25 22:19:08 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2008-11-25 22:19:08 -0800 |
| commit | 4715f079b9c61362755c95c1ebf89c97cc6fff2b (patch) | |
| tree | d9db5974fbbb38225a0eb389c5782ac779e20530 /configure.ac | |
| parent | 9ffc6719390df8fdd0a5295a7a7a0eaea792be45 (diff) | |
| parent | ed597f19fdc3017dde6d1452b5cdf8ddcd69a5b1 (diff) | |
Merge commit 'origin/master'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 200c141bd..de727d0e5 100644 --- a/configure.ac +++ b/configure.ac @@ -1220,7 +1220,6 @@ AC_MSG_RESULT([$XORG]) xorg_bus_linuxpci=no xorg_bus_bsdpci=no -xorg_bus_ix86pci=no xorg_bus_sparc=no if test "x$XORG" = xyes; then @@ -1357,15 +1356,6 @@ if test "x$XORG" = xyes; then sparc*) xorg_bus_sparc="yes" ;; - i*86|x86_64*|amd64*) - case $host_os in - *bsd*|linux*|solaris*) - ;; - *) - xorg_bus_ix86pci="yes" - ;; - esac - ;; esac if test "x$XORG_OS_PCI" = x ; then @@ -1459,7 +1449,6 @@ fi AM_CONDITIONAL([XORG], [test "x$XORG" = xyes]) AM_CONDITIONAL([XORG_BUS_LINUXPCI], [test "x$xorg_bus_linuxpci" = xyes]) AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes]) -AM_CONDITIONAL([XORG_BUS_IX86PCI], [test "x$xorg_bus_ix86pci" = xyes]) AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes]) AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes]) AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes]) |