xserver ChangeLog,3.255,3.256 configure.ac,3.92,3.93
David Reveman <xserver-commit-u7BhqnqprCWvj1b/[email protected]>
| Newsgroups | gmane.comp.freedesktop.xserver.cvs |
|---|---|
| Message-ID | <[email protected]> |
Committed by: davidr Update of /cvs/xserver/xserver In directory gabe:/tmp/cvs-serv32506 Modified Files: ChangeLog configure.ac Log Message: Add working Xgl server code Index: ChangeLog =================================================================== RCS file: /cvs/xserver/xserver/ChangeLog,v retrieving revision 3.255 retrieving revision 3.256 diff -u -d -r3.255 -r3.256 --- ChangeLog 4 Nov 2004 22:56:40 -0000 3.255 +++ ChangeLog 4 Nov 2004 23:19:13 -0000 3.256 @@ -1,3 +1,7 @@ +2004-11-05 David Reveman <[email protected]> + + Add working Xgl server code. + 2004-11-04 David Reveman <[email protected]> * render/mipict.c: Added miChangePictureTransform and Index: configure.ac =================================================================== RCS file: /cvs/xserver/xserver/configure.ac,v retrieving revision 3.92 retrieving revision 3.93 diff -u -d -r3.92 -r3.93 --- configure.ac 20 Oct 2004 18:06:58 -0000 3.92 +++ configure.ac 4 Nov 2004 23:19:13 -0000 3.93 @@ -99,6 +99,7 @@ AC_ARG_ENABLE(xwinserver, [ --enable-xwinserver ],[XWINSERVER=$enableval],[XWINSERVER=no]) AC_ARG_ENABLE(xsdlserver, [ --enable-xsdlserver ],[XSDLSERVER=$enableval],[XSDLSERVER=no]) AC_ARG_ENABLE(xglserver, [ --enable-xglserver ],[XGLSERVER=$enableval],[XGLSERVER=no]) +AC_ARG_ENABLE(xglxserver, [ --enable-xglxserver ],[XGLXSERVER=$enableval],[XGLXSERVER=yes]) AC_ARG_ENABLE(xtrap, [ --enable-xtrap ],[XTRAP=$enableval],[XTRAP=no]) AC_ARG_ENABLE(builtinrgb, [ --disable-builtinrgb ],[USE_RGB_BUILTIN=$enableval],[USE_RGB_BUILTIN=yes]) AC_ARG_ENABLE(screensaver, [ --disable-screensaver ], @@ -185,6 +186,13 @@ AM_CONDITIONAL(XGLSERVER, [test x$XGLSERVER = xyes]) if test "$XGLSERVER" = yes; then AC_DEFINE(XGLSERVER,1,[Build GL X server]) + XGL_REQUIRED_MODULES="glitz >= 0.3.0" +fi + +AM_CONDITIONAL(XGLXSERVER, [test x$XGLXSERVER = xyes]) +if test "$XGLXSERVER" = yes; then + AC_DEFINE(XGLXSERVER,1,[Build GLX X server]) + XGLX_REQUIRED_MODULES="glitz-glx >= 0.3.0" fi AM_CONDITIONAL(XTRAP, [test x$XTRAP = xyes]) @@ -468,22 +476,26 @@ XGL_LIBS= XGL_INCS= -XGL_PURE_LIBS= -XGL_PURE_INCS= if test "$XGLSERVER" = yes; then - XGL_PURE_LIBS="$DIX_LIB $OS_LIB \ - $MI_LIB $EXTENSION_LIBS $DAMAGE_LIB \ - $SHADOW_LIB $XPSTUBS_LIB" - XGL_PURE_INCS="$XGL_INC $DAMAGE_INC $SHADOW_INC $EXTENSION_INCS \ - $MI_INC" - XGL_LIBS="$XGL_PURE_LIBS $XGL_OS_LIB" - XGL_INCS="$XGL_PURE_INCS $XGL_OS_INC" + PKG_CHECK_MODULES(XGLSERVER, $XGL_REQUIRED_MODULES) + XGL_LIB='$(top_builddir)/hw/xgl/libxgl.a' + XGL_INC='-I$(top_srcdir)/hw/xgl' + XGL_LIBS="$DIX_LIB $XGL_LIB $OS_LIB $FB_LIB $MI_LIB \ + $EXTENSION_LIBS $DAMAGE_LIB $SHADOW_LIB \ + $XPSTUBS_LIB" + XGL_INCS="$XGL_INC $DAMAGE_INC $SHADOW_INC \ + $EXTENSION_INCS $FB_INC $MI_INC" fi -AC_SUBST([XGL_PURE_LIBS]) -AC_SUBST([XGL_PURE_INCS]) AC_SUBST([XGL_LIBS]) AC_SUBST([XGL_INCS]) +XGLX_DIRS= +if test "$XGLSERVER" = yes -a "$XGLXSERVER" = yes; then + PKG_CHECK_MODULES(XGLXSERVER, $XGLX_REQUIRED_MODULES) + XGLX_DIRS=glx +fi +AC_SUBST([XGLX_DIRS]) + AC_CHECK_HEADERS([X11/XF86keysym.h],,,${XSERVER_CFLAGS}) XSERVER_CFLAGS="$XSERVER_CFLAGS -D_BSD_SOURCE "'-I${top_srcdir}/include -I${top_srcdir}/Xext' @@ -564,4 +576,5 @@ hw/xnest/Makefile hw/xwin/Makefile hw/xgl/Makefile +hw/xgl/glx/Makefile ])