frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only build ix86Pci.c on x86 & amd64 platforms Set DEFAULT_INT10 to x86emu 

on everything but Linux/x86 Fix Sbus.c inclusion on sparc platforms
This commit is contained in:
Alan Coopersmith 2005-08-02 23:57:52 +00:00
parent 3d0d95004c
commit d7c246f35b
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure.ac
View File

@ -114,20 +114,30 @@ if test "$ac_cv_sysv_ipc" = yes; then
AC_DEFINE(HAVE_SYSV_IPC,1, [Define to 1 if SYSV IPC is available]) AC_DEFINE(HAVE_SYSV_IPC,1, [Define to 1 if SYSV IPC is available])
fi fi
### Choose bus options - replaces logic in hw/xfree86/os-support/bus/Imakefile
# Defaults:
DEFAULT_INT10="x86emu"
xorg_bus_sbus="no"
xorg_bus_ix86pci="no"
# Override defaults as needed for specific platforms:
case $host_cpu in case $host_cpu in
sparc*) sparc*)
xorg_bus_sbus="yes" xorg_bus_sbus="yes"
DEFAULT_INT10=x86emu
;; ;;
i*86) i*86)
xorg_bus_ix86pci="yes"
case $host_os in case $host_os in
solaris*) DEFAULT_INT10=x86emu ;; *linux*) DEFAULT_INT10=vm86 ;;
*) DEFAULT_INT10=vm86 ;; *bsd*) xorg_bus_ix86pci="no" ;;
esac esac
;; ;;
*) amd64*)
DEFAULT_INT10=x86emu xorg_bus_ix86pci="yes"
;; ;;
esac esac
REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xextproto xfont xproto xtrans xau xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto" REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xextproto xfont xproto xtrans xau xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto"
@ -694,6 +704,7 @@ AC_SUBST([XORG_OS])
AC_SUBST([XORG_OS_SUBDIR]) AC_SUBST([XORG_OS_SUBDIR])
AC_SUBST([XORG_OS_KBD]) AC_SUBST([XORG_OS_KBD])
AC_SUBST([XORG_OS_PCI]) AC_SUBST([XORG_OS_PCI])
AM_CONDITIONAL([XORG_BUS_IX86PCI], [test "x$xorg_bus_ix86pci" = xyes])
AM_CONDITIONAL([XORG_BUS_SBUS], [test "x$xorg_bus_sbus" = xyes]) AM_CONDITIONAL([XORG_BUS_SBUS], [test "x$xorg_bus_sbus" = xyes])
AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes]) AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes])

8
hw/xfree86/os-support/bus/Makefile.am
View File

@ -1,7 +1,11 @@
noinst_LTLIBRARIES = libbus.la noinst_LTLIBRARIES = libbus.la
sdk_HEADERS = xf86Pci.h sdk_HEADERS = xf86Pci.h
PCI_SOURCES = @XORG_OS_PCI@Pci.c ix86Pci.c PCI_SOURCES = @XORG_OS_PCI@Pci.c
if XORG_BUS_IX86PCI
PCI_SOURCES += ix86Pci.c
endif
if LINUX_IA64 if LINUX_IA64
PLATFORM_PCI_SOURCES = 460gxPCI.c altixPCI.c e8870PCI.c zx1PCI.c PLATFORM_PCI_SOURCES = 460gxPCI.c altixPCI.c e8870PCI.c zx1PCI.c
@ -10,7 +14,7 @@ endif
libbus_la_SOURCES = Pci.c $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) libbus_la_SOURCES = Pci.c $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES)
if XORG_BUS_SBUS if XORG_BUS_SBUS
libbus_la_SOURCES += Sbus.c libbus_la_SOURCES += Sbus.c
endif endif
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)