andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change xorg_bus_sbus to xorg_bus_sparc; build sparcPci.c on all SPARCs.

This commit is contained in:
Daniel Stone 2005-08-21 08:43:46 +00:00
parent 71b3fea94e
commit 367f450739
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -2,7 +2,9 @@
* configure.ac:
* hw/xfree86/loader/Makefile.am:
Add test for SPARC. Build SparcMulDiv.S on all SPARCs.
* hw/xfree86/os-support/bus/Makefile.am:
Add test for SPARC. Build SparcMulDiv.S, sparcPci.c, and Sbus.c on
all SPARCs; use xorg_bus_sparc instead of xorg_bus_sbus.
* configure.ac:
Make the default font path configurable.

9
configure.ac
View File

@ -131,14 +131,14 @@ fi
# Defaults:
DEFAULT_INT10="x86emu"
xorg_bus_sbus="no"
xorg_bus_sparc="no"
xorg_bus_ix86pci="no"
# Override defaults as needed for specific platforms:
case $host_cpu in
sparc*)
xorg_bus_sbus="yes"
xorg_bus_sparc="yes"
xorg_loader_sparcmuldiv="yes"
;;
i*86)
@ -698,8 +698,6 @@ test x$XORG = xyes && case $host_os in
ia64*)
linux_ia64=yes
;;
sparc*)
linux_sparc=yes
;;
*)
;;
@ -794,10 +792,9 @@ AC_SUBST([XORG_OS_SUBDIR])
AC_SUBST([XORG_OS_KBD])
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_SPARC], [test "x$xorg_bus_sparc" = xyes])
AM_CONDITIONAL([XORG_LOADER_SPARC], [test "x$xorg_loader_sparcmuldiv" = xyes])
AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes])
AM_CONDITIONAL([LINUX_SPARC], [test "x$linux_sparc" = xyes])
AM_CONDITIONAL([SOLARIS_USL_CONSOLE], [test "x$solaris_usl_console" = xyes])
AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes])

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

@ -11,15 +11,13 @@ if LINUX_IA64
PLATFORM_PCI_SOURCES = 460gxPCI.c altixPCI.c e8870PCI.c zx1PCI.c
endif
if LINUX_SPARC
if XORG_BUS_SPARC
PLATFORM_PCI_SOURCES = sparcPci.c
PLATFORM_SOURCES = Sbus.c
endif
libbus_la_SOURCES = Pci.c $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES)
if XORG_BUS_SBUS
libbus_la_SOURCES += Sbus.c
endif
libbus_la_SOURCES = Pci.c $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \
$(PLATFORM_SOURCES)
INCLUDES = $(XORG_INCS)