xserver ChangeLog,3.381,3.382 configure.ac,3.109,3.110

Committed by: davidr

Update of /cvs/xserver/xserver
In directory gabe:/tmp/cvs-serv7161

Modified Files:
	ChangeLog configure.ac 
Log Message:
Make Xglx and Xegl build

Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.381
retrieving revision 3.382
diff -u -d -r3.381 -r3.382
--- ChangeLog	3 Jan 2006 10:18:30 -0000	3.381
+++ ChangeLog	3 Jan 2006 16:16:37 -0000	3.382
@@ -1,3 +1,11 @@
+2006-01-03  David Reveman  <[email protected]>
+
+	* configure.ac: Add XGL_GLXEXT_LIB to XGLX_LIBS and XEGL_LIBS.
+
+	* hw/xgl/egl/xeglinit.c: Fix so that Xegl builds.
+
+	* hw/xgl/glx/xglxinit.c: Fix so that Xglx builds.
+
 2006-01-03  Dave Airlie  <[email protected]>
 
 	* Xext/xevie.c: (XevieExtensionInit), (sendEvent),

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.109
retrieving revision 3.110
diff -u -d -r3.109 -r3.110
--- configure.ac	3 Jan 2006 08:32:48 -0000	3.109
+++ configure.ac	3 Jan 2006 16:16:37 -0000	3.110
@@ -560,7 +560,7 @@
 if test "x$XGLX" = xyes; then
 	XGLX_LIB='$(top_builddir)/hw/xgl/glx/libxglx.la'
 	XGLX_INC='-I$(top_srcdir)/hw/xgl/glx'
-	XGLX_LIBS="$XGLX_LIB $XGL_LIBS"
+	XGLX_LIBS="$XGLX_LIB $XGL_GLXEXT_LIB $XGL_LIBS"
 	XGLX_INCS="$XGLX_INC $XGL_GLXEXT_INC $XGL_INCS"
 	XGLX_MOD_LIBS="$XGLX_LIB $XGL_GLXEXT_LIB"
 fi
@@ -585,7 +585,7 @@
 if test "x$XEGL" = xyes; then
 	XEGL_INC='-I$(top_srcdir)/hw/xgl/egl'
 	XEGL_LIB='$(top_builddir)/hw/xgl/egl/libxegl.la'
-	XEGL_LIBS="$XEGL_LIB $XGL_LIBS"
+	XEGL_LIBS="$XEGL_LIB $XGL_GLXEXT_LIB $XGL_LIBS"
 	XEGL_INCS="$XEGL_INC $XGL_GLXEXT_INC $XGL_INCS"
 	XEGL_MOD_LIBS="$XEGL_LIB $XGL_GLXEXT_LIB"
 fi