fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-14 09:00:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix so that Xgl builds

Browse source
This commit is contained in:
David Reveman 2006-03-09 18:06:20 +00:00
parent 062c61dcf3
commit cf4788317f
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2006-03-09 David Reveman <davidr@novell.com>
* configure.ac: Back out last change, Xorg and Xgl servers cannot yet
be built at the same time.
* GL/mesa/Makefile.am (SUBDIRS): Remove glapi from SUBDIRS, it
shouldn't be there, glapi sources are now in $(top_srcdir)/GL/glx.
2006-03-09 Matthias Hopf <mhopf@suse.de>
* GL/glx/Makefile.am: find xf86dristr.h again.

2
GL/mesa/Makefile.am
View file

@ -1,4 +1,4 @@
SUBDIRS = main math array_cache swrast swrast_setup tnl shader X glapi
SUBDIRS = main math array_cache swrast swrast_setup tnl shader X
noinst_LTLIBRARIES = libGLcore.la

2
configure.ac
View file

@ -1006,7 +1006,7 @@ xorg_bus_ppcpci=no
xorg_bus_sparcpci=no
xorg_bus_sparc=no
if test "x$XORG" = xyes -o "x$XGL" = xyes; then
if test "x$XORG" = xyes; then
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"