xserver ChangeLog,3.330,3.331 configure.ac,3.99,3.100

Committed by: davidr

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
Add GLX includes to EXTENSION_INCS

Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.330
retrieving revision 3.331
diff -u -d -r3.330 -r3.331
--- ChangeLog	7 Jun 2005 15:36:12 -0000	3.330
+++ ChangeLog	7 Jun 2005 15:42:28 -0000	3.331
@@ -1,5 +1,7 @@
 2005-06-07  David Reveman  <[email protected]>
 
+	* configure.ac: Add GLX includes to EXTENSION_INCS.
+
 	* GL/mesa/X/xf86glx.c: Track changes to GLX code.
 	(fixup_visuals): 
 	(init_screen_visuals): Support for ARGB visuals. 

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.99
retrieving revision 3.100
diff -u -d -r3.99 -r3.100
--- configure.ac	5 Jun 2005 01:58:41 -0000	3.99
+++ configure.ac	7 Jun 2005 15:42:28 -0000	3.100
@@ -228,8 +228,8 @@
 AM_CONDITIONAL(GLX, test x$GLX = xyes)
 if test "$GLX" = yes; then
 	AC_DEFINE(GLXEXT,1,[Build GLX extension])
+	EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/GL/glx -I$(top_srcdir)/GL/include -I$(MESA_SOURCE)/include'
 	EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/GL/glx/libglx.a $(top_builddir)/GL/mesa/libglcore.a'
-	dnl EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/glx'
 fi
 AC_SUBST([MESA_SOURCE])