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

Add test for SPARC. Build SparcMulDiv.S on all SPARCs. 

Make the default font path configurable.
This commit is contained in:
Daniel Stone 2005-08-21 06:56:19 +00:00
parent d96e666686
commit db2909ce76
4 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,9 +1,18 @@
2005-08-21 Daniel Stone <daniel@freedesktop.org>
* configure.ac:
* hw/xfree86/loader/Makefile.am:
Add test for SPARC. Build SparcMulDiv.S on all SPARCs.
* configure.ac:
Make the default font path configurable.
2005-08-20 Adam Jackson <ajax@freedesktop.org> 2005-08-20 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/os-support/bus/Makefile.am: * hw/xfree86/os-support/bus/Makefile.am:
Add sparcPci.c to EXTRA_DIST. Add sparcPci.c to EXTRA_DIST.
2005-08-20 Daniel Stone <daniel@fooishbar.org> 2005-08-20 Daniel Stone <daniel@freedesktop.org>
* configure.ac: * configure.ac:
Make symlink-mesa.sh usage srcdir != objdir safe. Make symlink-mesa.sh usage srcdir != objdir safe.

11
configure.ac
View File

@ -139,6 +139,7 @@ xorg_bus_ix86pci="no"
case $host_cpu in case $host_cpu in
sparc*) sparc*)
xorg_bus_sbus="yes" xorg_bus_sbus="yes"
xorg_loader_sparcmuldiv="yes"
;; ;;
i*86) i*86)
xorg_bus_ix86pci="yes" xorg_bus_ix86pci="yes"
@ -228,6 +229,9 @@ AC_ARG_WITH(os-vendor, [ --with-os-vendor=OSVENDOR ],
AC_ARG_WITH(mesa-source, [ --with-mesa-source=MESA_SOURCE ], AC_ARG_WITH(mesa-source, [ --with-mesa-source=MESA_SOURCE ],
[ MESA_SOURCE="$withval" ], [ MESA_SOURCE="$withval" ],
[ MESA_SOURCE="" ]) [ MESA_SOURCE="" ])
AC_ARG_WITH(default-font-path, [ --with-default-font-path=PATH ],
[ FONTPATH="$withval" ],
[ FONTPATH="${datadir}/X11/fonts" ])
AM_CONDITIONAL(INT10_VM86, [test x$INT10 = xvm86]) AM_CONDITIONAL(INT10_VM86, [test x$INT10 = xvm86])
AM_CONDITIONAL(INT10_X86EMU, [test x$INT10 = xx86emu]) AM_CONDITIONAL(INT10_X86EMU, [test x$INT10 = xx86emu])
@ -582,7 +586,7 @@ PKG_CHECK_MODULES(XFONT, xfont)
# --enable-fc.]) # --enable-fc.])
#fi #fi
AC_DEFINE_UNQUOTED(COMPILEDDEFAULTFONTPATH, ["$FONTPATH"], [Default font path]) AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, ["$FONTPATH"], [Default font path])
AC_DEFINE_UNQUOTED(XVENDORNAME,["$VENDOR_STRING"], [Vendor name]) AC_DEFINE_UNQUOTED(XVENDORNAME,["$VENDOR_STRING"], [Vendor name])
AC_DEFINE_UNQUOTED(XORG_RELEASE, ["$VENDOR_RELEASE"], [Vendor release]) AC_DEFINE_UNQUOTED(XORG_RELEASE, ["$VENDOR_RELEASE"], [Vendor release])
AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address]) AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address])
@ -694,6 +698,9 @@ test x$XORG = xyes && case $host_os in
ia64*) ia64*)
linux_ia64=yes linux_ia64=yes
;; ;;
sparc*)
linux_sparc=yes
;;
*) *)
;; ;;
esac esac
@ -788,7 +795,9 @@ 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_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([XORG_LOADER_SPARC], [test "x$xorg_loader_sparcmuldiv" = xyes])
AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = 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_USL_CONSOLE], [test "x$solaris_usl_console" = xyes])
AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes]) AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes])

10
hw/xfree86/loader/Makefile.am
View File

@ -8,6 +8,10 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \
#AM_LDFLAGS = -r #AM_LDFLAGS = -r
AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS)
if XORG_LOADER_SPARC
SPARC_SOURCES = SparcMulDiv.S
endif
EXTRA_DIST = \ EXTRA_DIST = \
aout.h \ aout.h \
aoutloader.h \ aoutloader.h \
@ -20,7 +24,8 @@ EXTRA_DIST = \
hash.h \ hash.h \
loader.h \ loader.h \
loaderProcs.h \ loaderProcs.h \
sym.h sym.h \
SparcMulDiv.S
libloader_a_SOURCES = \ libloader_a_SOURCES = \
loader.c \ loader.c \
@ -38,4 +43,5 @@ libloader_a_SOURCES = \
fontsym.c \ fontsym.c \
misym.c \ misym.c \
xf86sym.c \ xf86sym.c \
hash.c hash.c \
$(SPARC_SOURCES)

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

@ -11,6 +11,10 @@ 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
endif endif
if LINUX_SPARC
PLATFORM_PCI_SOURCE = sparcPci.c
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
@ -34,4 +38,3 @@ EXTRA_DIST = \
zx1PCI.h \ zx1PCI.h \
xf86Sbus.h \ xf86Sbus.h \
$(PCIDISTSOURCES) $(PCIDISTSOURCES)