Use bsd_pci stub routines on Solaris too, since we use pciaccess for real work
Depends on commit 70e18a3b6b
to get
definition of xf86InitVidMem on Solaris.
This commit is contained in:
parent
3932a84857
commit
570835b9a8
|
@ -1278,6 +1278,9 @@ if test "x$XORG" = xyes; then
|
||||||
solaris*)
|
solaris*)
|
||||||
XORG_OS="solaris"
|
XORG_OS="solaris"
|
||||||
XORG_OS_SUBDIR="solaris"
|
XORG_OS_SUBDIR="solaris"
|
||||||
|
# Use the same stubs as BSD for old functions, since we now
|
||||||
|
# use libpciaccess for PCI
|
||||||
|
xorg_bus_bsdpci="yes"
|
||||||
AC_CHECK_HEADERS([sys/kd.h])
|
AC_CHECK_HEADERS([sys/kd.h])
|
||||||
# This really should be tests for specific features, but the #ifdef's
|
# This really should be tests for specific features, but the #ifdef's
|
||||||
# were done as a simple version check in XFree86 4.x and haven't been
|
# were done as a simple version check in XFree86 4.x and haven't been
|
||||||
|
@ -1346,7 +1349,7 @@ if test "x$XORG" = xyes; then
|
||||||
;;
|
;;
|
||||||
i*86|x86_64*|amd64*)
|
i*86|x86_64*|amd64*)
|
||||||
case $host_os in
|
case $host_os in
|
||||||
*bsd*|linux*)
|
*bsd*|linux*|solaris*)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
xorg_bus_ix86pci="yes"
|
xorg_bus_ix86pci="yes"
|
||||||
|
|
|
@ -179,7 +179,7 @@
|
||||||
#define PCI_CFGMECH1_MAXDEV 32
|
#define PCI_CFGMECH1_MAXDEV 32
|
||||||
|
|
||||||
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
|
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
|
||||||
defined(__DragonFly__)
|
defined(__DragonFly__) || defined(__sun)
|
||||||
#define ARCH_PCI_INIT bsdPciInit
|
#define ARCH_PCI_INIT bsdPciInit
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user