[xserver-commit] xserver ChangeLog,3.121,3.122 Makefile.am,3.11,3.12 configure.ac,3.51,3.52

[Eric Anholt]

Committed by: anholt

Update of /cvs/xserver/xserver
In directory pdx:/home/anholt/xserver

Modified Files:
	ChangeLog Makefile.am configure.ac 
Log Message:
- Connect GLX files to the build after repocopy from DRI CVS.  Controlled
  by --enable-glx switch to ./configure.  GLX won't work until an upcoming
  commit to fb/
- Fix up dri/ to handle building with GLX.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.121
retrieving revision 3.122
diff -u -d -r3.121 -r3.122
--- ChangeLog	25 Jan 2004 01:30:31 -0000	3.121
+++ ChangeLog	25 Jan 2004 05:24:08 -0000	3.122
@@ -1,5 +1,17 @@
 2004-01-24  Eric Anholt  <anholt@FreeBSD.org>
 
+	* Makefile.am:
+	* configure.ac:
+	* dri/Makefile.am:
+	* dri/dri.c: (DRICreateDummyContext), (DRICreateContext):
+	* include/Makefile.am:
+	- Connect GLX files to the build after repocopy from DRI CVS.  Controlled
+	  by --enable-glx switch to ./configure.  GLX won't work until an upcoming
+	  commit to fb/
+	- Fix up dri/ to handle building with GLX.
+
+2004-01-24  Eric Anholt  <anholt@FreeBSD.org>
+
 	* hw/kdrive/ati/ati.c: (ATIScreenInit), (ATILog2):
 	* hw/kdrive/ati/ati.h:
 	* hw/kdrive/ati/ati_dri.c: (ATIInitVisualConfigs), (ATIDRIAgpInit),

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/Makefile.am,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -d -r3.11 -r3.12
--- Makefile.am	29 Dec 2003 06:23:59 -0000	3.11
+++ Makefile.am	25 Jan 2004 05:24:09 -0000	3.12
@@ -1,5 +1,9 @@
 AUTOMAKE_OPTIONS=dist-bzip2
 
+if GLX
+GLX_SUBDIR=	GL
+endif
+
 if DRI
 DRI_SUBDIRS=	drm dri
 endif
@@ -20,6 +24,7 @@
 	render  \
 	xfixes  \
 	damageext \
+	$(GLX_SUBDIR) \
 	$(DRI_SUBDIRS) \
 	$(COMPOSITE_SUBDIR) \
 	hw

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.51
retrieving revision 3.52
diff -u -d -r3.51 -r3.52
--- configure.ac	25 Jan 2004 01:20:28 -0000	3.51
+++ configure.ac	25 Jan 2004 05:24:09 -0000	3.52
@@ -100,8 +100,12 @@
 			     [SCREENSAVER=yes])
 AC_ARG_ENABLE(xdmcp,         [  --disable-xdmcp ],[XDMCP=$enableval],[XDMCP=auto])
 AC_ARG_ENABLE(xdm-auth-1,    [  --disable-xdm-auth-1 ],[XDMAUTH=$enableval],[XDMAUTH=auto])
+AC_ARG_ENABLE(glx,           [  --enable-glx ],[GLX=$enableval],[GLX=no])
 AC_ARG_ENABLE(dri,           [  --enable-dri ],[DRI=$enableval],[DRI=no])
 
+AC_ARG_WITH(mesa-source,        [  --with-mesa-source=PATH ],
+				[MESA_SOURCE="$withval"],
+				[MESA_SOURCE="\$(top_srcdir)/../Mesa"])
 AC_ARG_WITH(fontpath,        [  --with-fontpath=PATH ],
 				[FONTPATH="$withval"],
 				[FONTPATH="$DEFAULT_FONT_PATH"])
@@ -165,6 +169,14 @@
 	REQUIRED_MODULES="$REQUIRED_MODULES resourceext"
 fi
 
+AM_CONDITIONAL(GLX, test x$GLX = xyes)
+if test "$GLX" = yes; then
+	AC_DEFINE(GLXEXT,1,[Build GLX extension])
+	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])
+
 AM_CONDITIONAL(DRI, test x$DRI = xyes)
 if test "$DRI" = yes; then
 	AC_DEFINE(XF86DRI,1,[Build DRI extension])
@@ -385,6 +397,9 @@
 
 AC_OUTPUT([
 Makefile
+GL/Makefile
+GL/glx/Makefile
+GL/mesa/Makefile
 include/Makefile
 dix/Makefile
 dri/Makefile