additional configs (Dan Schikore)

2 files changed, 477 insertions, 17 deletions

diff --git a/Make-config b/Make-config
index 6d69ddc727..209db45588 100644
--- a/Make-config
+++ b/Make-config
@@ -45,7 +45,54 @@ aix:
 	"GLW_LIB = libGLw.a" \
 	"OSMESA_LIB = libOSMesa.a" \
 	"CC = cc" \
+	"CXX = xlC" \
+	"CFLAGS = -O -DAIXV3 -DPTHREADS" \
+	"CXXFLAGS = -O -DAIXV3 -DPTHREADS" \
+	"MKLIB_OPTIONS = -static" \
+	"APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
+
+aix-nothreads:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"CC = cc" \
+	"CXX = xlC" \
 	"CFLAGS = -O -DAIXV3" \
+	"CXXFLAGS = -O -DAIXV3" \
+	"MKLIB_OPTIONS = -static" \
+	"APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
+
+aix-64:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"LIBDIR = $(TOP)/lib64" \
+	"CC = cc" \
+	"CXX = xlC" \
+	"CFLAGS = -q64 -O -DAIXV3 -DPTHREADS" \
+	"CXXFLAGS = -q64 -O -DAIXV3 -DPTHREADS" \
+	"MKLIB_OPTIONS = -static -arch AIX64" \
+	"APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
+
+aix-64-nothreads:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"LIBDIR = $(TOP)/lib64" \
+	"CC = cc" \
+	"CXX = xlC" \
+	"CFLAGS = -q64 -O -DAIXV3" \
+	"CXXFLAGS = -q64 -O -DAIXV3" \
+	"MKLIB_OPTIONS = -static -arch AIX64" \
 	"APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
 
 # XXX probably out of date
@@ -145,6 +192,44 @@ darwin:
 	"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL \
                        -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" 
 
+darwin-static:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"CC = gcc" \
+	"CXX = g++" \
+	"CFLAGS = -I/sw/include -I/usr/X11R6/include -O3 -fPIC -fno-common \
+		-ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp \
+		-Ddarwin -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
+	"CXXFLAGS = $(CFLAGS)" \
+	"MKLIB_OPTIONS = -static" \
+	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
+	"GLU_LIB_DEPS = -L../lib -lGL -lm" \
+	"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+	"APP_LIB_DEPS = -lm"
+
+darwin-static-nothreads:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"CC = gcc" \
+	"CXX = g++" \
+	"CFLAGS = -I/sw/include -I/usr/X11R6/include -O3 -fPIC -fno-common \
+		-ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp \
+		-Ddarwin -DUSE_XSHM -I/usr/X11R6/include" \
+	"CXXFLAGS = $(CFLAGS)" \
+	"MKLIB_OPTIONS = -static" \
+	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm" \
+	"GLU_LIB_DEPS = -L../lib -lGL -lm" \
+	"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+	"APP_LIB_DEPS = -lm"
+
 freebsd:
 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
 	"GL_LIB = libGL.a" \
@@ -301,6 +386,93 @@ hpux10-gcc-sl:
 	"GLUT_CFLAGS = -fexceptions" \
 	"APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
+hpux11-32:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"CC = cc" \
+	"CXX = aCC" \
+	"CFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -D_USE_ISFINITE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS" \
+	"CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -D_USE_ISFINITE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS" \
+	"MKLIB_OPTIONS = -static" \
+	"APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+
+hpux11-32-nothreads:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"CC = cc" \
+	"CXX = aCC" \
+	"CFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -D_USE_ISFINITE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
+	"CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -D_USE_ISFINITE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
+	"MKLIB_OPTIONS = -static" \
+	"APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+
+hpux11-64:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"LIBDIR = $(TOP)/lib64" \
+	"CC = cc" \
+	"CXX = aCC" \
+	"CFLAGS = +O3 +DA2.0W -Ae -D_HPUX_SOURCE -D_USE_ISFINITE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS" \
+	"CXXFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -D_USE_ISFINITE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS" \
+	"MKLIB_OPTIONS = -static" \
+	"APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+
+hpux11-64-nothreads:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"LIBDIR = $(TOP)/lib64" \
+	"CC = cc" \
+	"CXX = aCC" \
+	"CFLAGS = +O3 +DA2.0W -Ae -D_HPUX_SOURCE -D_USE_ISFINITE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
+	"CXXFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -D_USE_ISFINITE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
+	"MKLIB_OPTIONS = -static" \
+	"APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+
+hpux11-ia64:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"LIBDIR = $(TOP)/lib64" \
+	"CC = cc" \
+	"CXX = aCC" \
+	"CFLAGS = +O3 +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS" \
+	"CXXFLAGS = +O3 +DD64 -Aa -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS" \
+	"MKLIB_OPTIONS = -static" \
+	"APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+
+hpux11-ia64-nothreads:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"LIBDIR = $(TOP)/lib64" \
+	"CC = cc" \
+	"CXX = aCC" \
+	"CFLAGS = +O3 +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
+	"CXXFLAGS = +O3 +DD64 -Aa -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
+	"MKLIB_OPTIONS = -static" \
+	"APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
 # IRIX 6 32-bit Targets
 #	Turn Warnings off for these errors (MIPSpro Compiler 7.30)
@@ -350,7 +522,22 @@ irix6-n32:
 	"LIBDIR = $(TOP)/lib32" \
 	"CC = cc" \
 	"CXX = CC" \
-	"CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM" \
+	"CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM -DPTHREAD" \
+	"CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552 -DPTHREAD" \
+	"MKLIB_OPTIONS = -static" \
+	"APP_LIB_DEPS = -n32 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm -lpthread"
+
+irix6-n32-nothreads:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"LIBDIR = $(TOP)/lib32" \
+	"CC = cc" \
+	"CXX = CC" \
+	"CFLAGS = -n32 -mips3 -O3 -ansi -woff 1209,1521" \
 	"CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552" \
 	"MKLIB_OPTIONS = -static" \
 	"APP_LIB_DEPS = -n32 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm"
@@ -402,6 +589,21 @@ irix6-64:
 	"LIBDIR = $(TOP)/lib64" \
 	"CC = cc" \
 	"CXX = CC" \
+	"CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -DPTHREAD" \
+	"CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREAD" \
+	"MKLIB_OPTIONS = -static" \
+	"APP_LIB_DEPS = -64 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm -lpthread"
+
+irix6-64-nothreads:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"LIBDIR = $(TOP)/lib64" \
+	"CC = cc" \
+	"CXX = CC" \
 	"CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM" \
 	"CXXFLAGS = -64 -O3 -ansi -woff 1174" \
 	"MKLIB_OPTIONS = -archopt 64 -static" \
@@ -452,7 +654,7 @@ linux:
 	"GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
 	"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
 	"GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \
-	"APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
+	"APP_LIB_DEPS = -lglut -lGLU -lGL -lm"
 
 linux-static:
 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -492,6 +694,78 @@ linux-x86:
 	"APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
 	"ASM_SOURCES = $(X86_SOURCES)"
 
+linux-x86-static:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"CC = gcc" \
+	"CXX = g++" \
+	"CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include" \
+	"CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
+	"MKLIB_OPTIONS = -static" \
+	"GLUT_CFLAGS = -fexceptions" \
+	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
+	"GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
+	"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+	"GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \
+	"APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
+	"ASM_SOURCES = $(X86_SOURCES)"
+
+linux-x86-static-nothreads:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"CC = gcc" \
+	"CXX = g++" \
+	"CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -I/usr/X11R6/include" \
+	"CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
+	"MKLIB_OPTIONS = -static" \
+	"GLUT_CFLAGS = -fexceptions" \
+	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm " \
+	"GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
+	"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+	"GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \
+	"APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
+	"ASM_SOURCES = $(X86_SOURCES)"
+
+linux-x86-64-static:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"CC = gcc" \
+	"CPLUSPLUS = g++" \
+	"CFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -falign-loops=2 -falign-jumps=2 -falign-functions=2 -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
+	"MKLIB_OPTIONS = -static" \
+	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
+	"GLU_LIB_DEPS = -L../lib -lGL -lm" \
+	"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+	"APP_LIB_DEPS = -lm"
+
+linux-x86-64-static-nothreads:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"CC = gcc" \
+	"CPLUSPLUS = g++" \
+	"CFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -falign-loops=2 -falign-jumps=2 -falign-functions=2 -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -I/usr/X11R6/include" \
+	"MKLIB_OPTIONS = -static" \
+	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm" \
+	"GLU_LIB_DEPS = -L../lib -lGL -lm" \
+	"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+	"APP_LIB_DEPS = -lm"
+
 linux-x86-sse:
 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
 	"GL_LIB = libGL.so" \
@@ -527,6 +801,42 @@ linux-icc:
 	"ASM_SOURCES = $(X86_SOURCES)" \
 	"MKLIB_OPTIONS = -arch icc"
 
+linux-icc-static:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"CC = icc" \
+	"CXX = icpc" \
+	"CFLAGS = -O3 -tpp6 -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include" \
+	"MKLIB_OPTIONS = -static" \
+	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
+	"GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
+	"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+	"APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
+	"ASM_SOURCES = $(X86_SOURCES)" \
+	"MKLIB_OPTIONS = -static -arch icc"
+
+linux-icc-static-nothreads:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"CC = icc" \
+	"CXX = icpc" \
+	"CFLAGS = -O3 -tpp6 -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -I/usr/X11R6/include" \
+	"MKLIB_OPTIONS = -static" \
+	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm" \
+	"GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
+	"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+	"APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
+	"ASM_SOURCES = $(X86_SOURCES)" \
+	"MKLIB_OPTIONS = -static -arch icc"
+
 # Contributed by Uwe_Maurer@t-online.de
 linux-ggi:
 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -614,6 +924,42 @@ linux-x86-glide:
 	"APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
 	"ASM_SOURCES = $(X86_SOURCES)"
 
+linux-ia64-ecc-static:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"CC = ecc" \
+	"CPLUSPLUS = ecpc" \
+	"CFLAGS = -O3 -ansi -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
+	"CXXFLAGS = -O3 -ansi -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
+	"MKLIB_OPTIONS = -static" \
+	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
+	"GLU_LIB_DEPS = -L../lib -lGL -lm" \
+	"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+	"APP_LIB_DEPS = -lm" \
+	"ASM_SOURCES ="
+
+linux-ia64-ecc-static-nothreads:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"CC = ecc" \
+	"CPLUSPLUS = ecpc" \
+	"CFLAGS = -O3 -ansi -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -I/usr/X11R6/include" \
+	"CXXFLAGS = -O3 -ansi -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -I/usr/X11R6/include" \
+	"MKLIB_OPTIONS = -static" \
+	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
+	"GLU_LIB_DEPS = -L../lib -lGL -lm" \
+	"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+	"APP_LIB_DEPS = -lm" \
+	"ASM_SOURCES ="
+
 linux-alpha:
 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
 	"GL_LIB = libGL.so" \
@@ -778,7 +1124,7 @@ linux-solo:
 	"GLUT_LIB = libglut.so" \
 	"CC = gcc" \
 	"CXX = g++" \
-	"CFLAGS = -Wmissing-prototypes -g -std=c99 -pedantic -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
+	"CFLAGS = -g -std=c99 -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
 	"CXXFLAGS = -g -Wall -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
 	"GLUT_CFLAGS = -fexceptions" \
 	"GL_LIB_DEPS = -lm -lpthread -lexpat" \
@@ -871,20 +1217,38 @@ openstep-win32:
 
 osf1:
 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
-	"GL_LIB = libGL.so" \
-	"GLU_LIB = libGLU.so" \
-	"GLUT_LIB = libglut.so" \
-	"GLW_LIB = libGLw.so" \
-	"OSMESA_LIB = libOSMesa.so" \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
 	"CC = cc" \
 	"CXX = cxx" \
-	"CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM" \
-	"CXXFLAGS = -O2 -std ansi -ieee" \
+	"CFLAGS = -O0 -std1 -ieee_with_no_inexact -DPTHREADS -D_REENTRANT -DUSE_XSHM" \
+	"CXXFLAGS = -O0 -std1 -ieee_with_no_inexact -DPTHREADS -D_REENTRANT -DUSE_XSHM" \
+	"MKLIB_OPTIONS = -static" \
 	"GL_LIB_DEPS = -lX11 -lXext -lm -lpthread" \
 	"GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
 	"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm" \
 	"APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
 
+osf1-nothreads:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"CC = cc" \
+	"CXX = cxx" \
+	"CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM" \
+	"CXXFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM" \
+	"MKLIB_OPTIONS = -static" \
+	"GL_LIB_DEPS = -lX11 -lXext -lm" \
+	"GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
+	"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm" \
+	"APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
+
 # QNX V4 & Watcom Compiler
 qnx:
 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1007,6 +1371,64 @@ sunos5:
 	"GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/openwin/lib -lXt -lX11" \
 	"APP_LIB_DEPS = -lCrun -lX11 -lglut -lGLU -lGL -lm"
 
+sunos5-v8:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"CC = cc" \
+	"CXX = CC" \
+	"CFLAGS = -xarch=v8 -Xa -xO4 -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
+	"CXXFLAGS = -xarch=v8 -Xa -xO4 -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
+	"MKLIB_OPTIONS = -static" \
+	"APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+
+sunos5-v9:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"LIBDIR = $(TOP)/lib64" \
+	"CC = cc" \
+	"CXX = CC" \
+	"CFLAGS = -xarch=v9 -Xa -xO4 -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
+	"CXXFLAGS = -xarch=v9 -Xa -xO4 -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
+	"MKLIB_OPTIONS = -static" \
+	"APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+
+sunos5-v8-pthread:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"CC = cc" \
+	"CXX = CC" \
+	"CFLAGS = -xarch=v8 -mt -Xa -xO4 -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG -DPTHREADS" \
+	"CXXFLAGS = -xarch=v8 -mt -Xa -xO4 -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG -DPTHREADS" \
+	"MKLIB_OPTIONS = -static" \
+	"APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread -lm"
+
+sunos5-v9-pthread:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.a" \
+	"GLU_LIB = libGLU.a" \
+	"GLUT_LIB = libglut.a" \
+	"GLW_LIB = libGLw.a" \
+	"OSMESA_LIB = libOSMesa.a" \
+	"LIBDIR = $(TOP)/lib64" \
+	"CC = cc" \
+	"CXX = CC" \
+	"CFLAGS = -xarch=v9 -mt -Xa -xO4 -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG -DPTHREADS" \
+	"CXXFLAGS = -xarch=v9 -mt -Xa -xO4 -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG -DPTHREADS" \
+	"MKLIB_OPTIONS = -static" \
+	"APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread -lm"
+
 sunos5-smp:
 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
 	"GL_LIB = libGL.so" \
diff --git a/Makefile.X11 b/Makefile.X11
index 7945418627..012f98044b 100644
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.114 2004/03/02 17:28:56 brianp Exp $
+# $Id: Makefile.X11,v 1.115 2004/03/18 16:02:27 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  6.1
@@ -34,12 +34,17 @@ SHELL = /bin/sh
 default:
 	@echo "Type one of the following:"
 	@echo "  make aix                   for AIX systems with xlc"
+	@echo "  make aix-nothreads         for AIX systems with xlc, no threads"
+	@echo "  make aix64                 for AIX systems with xlc, 64-bit"
+	@echo "  make aix64-nothreads       for AIX systems with xlc, 64-bit, no threads"
 	@echo "  make aix-sl                for AIX systems, make shared libs"
 	@echo "  make aix-gcc               for AIX sytems with gcc"
 	@echo "  make beos-r4               for BeOS R4"
 	@echo "  make cygnus                for Win95/NT using Cygnus-Win32"
 	@echo "  make cygnus-linux          for Win95/NT using Cygnus-Win32 under Linux"
 	@echo "  make darwin                for Darwin - Mac OS X"
+	@echo "  make darwin-static         for Darwin - Mac OS X, static libs"
+	@echo "  make darwin-static-nothreads for Darwin - Mac OS X, static libs, no threads"
 	@echo "  make freebsd               for FreeBSD systems with GCC"
 	@echo "  make freebsd-386           for FreeBSD systems with GCC, w/ Intel assembly"
 	@echo "  make gcc-sl                for a generic system with GCC for shared libs"
@@ -51,23 +56,37 @@ default:
 	@echo "  make hpux10-sl             for HP systems with HPUX 10.x and 11.x, shared libs"
 	@echo "  make hpux10-gcc            for HP systems with HPUX 10.x w/ GCC"
 	@echo "  make hpux10-gcc-sl         for HP systems with HPUX 10.x w/ GCC, shared libs"
+	@echo "  make hpux11-32             for HP systems with HPUX 11.x, static libs"
+	@echo "  make hpux11-32-nothreads   for HP systems with HPUX 11.x, static libs, no threads"
+	@echo "  make hpux11-64             for HP systems with HPUX 11.x, 64-bit static libs"
+	@echo "  make hpux11-64-nothreads   for HP systems with HPUX 11.x, 64-bit static libs, no threads"
+	@echo "  make hpux11-ia64           for HP IA64 systems with HPUX 11.x, 64-bit static libs"
+	@echo "  make hpux11-ia64-nothreads for HP IA64 systems with HPUX 11.x, 64-bit static libs, no threads"
 	@echo "  make irix6-o32             for SGI systems with IRIX 6.x, make o32-bit libs"
 	@echo "  make irix6-o32-dso         for SGI systems with IRIX 6.x, make o32-bit DSOs"
 	@echo "  make irix6-n32             for SGI systems with IRIX 6.x, make n32-bit libs"
+	@echo "  make irix6-n32-nothreads   for SGI systems with IRIX 6.x, make n32-bit libs, no threads"
 	@echo "  make irix6-n32-dso         for SGI systems with IRIX 6.x, make n32-bit DSOs"
 	@echo "  make irix6-gcc-n32-sl      for SGI systems with IRIX 6.x, GCC, make n32 DSOs"
 	@echo "  make irix6-64              for SGI systems with IRIX 6.x, make 64-bit libs"
+	@echo "  make irix6-64-nothreads    for SGI systems with IRIX 6.x, make 64-bit libs, no threads"
 	@echo "  make irix6-64-dso          for SGI systems with IRIX 6.x, make 64-bit DSOs"
 
 	@echo "  make linux                 for Linux"
-	@echo "  make linux-static          for Linux, make static libs"
+	@echo "  make linux-static          for Linux, static libs"
 	@echo "  make linux-x86             for Linux with x86 optimizations"
+	@echo "  make linux-x86-static      for Linux with x86 optimizations, static libs"
+	@echo "  make linux-x86-static-nothreads  for Linux with x86 optimizations, static, no threads"
+	@echo "  make linux-x86-64-static   for Linux with x86_64 optimizations, static libs"
+	@echo "  make linux-x86-64-static-nothreads   for Linux with x86_64 optimizations, static libs, no threads"
 	@echo "  make linux-ggi             for Linux with libggi driver"
 	@echo "  make linux-x86-ggi         for Linux with libggi driver and x86 optimizations"
 	@echo "  make linux-glide           for Linux with 3Dfx Glide driver"
 	@echo "  make linux-x86-glide       for Linux with 3Dfx Glide driver and x86 opts"
 	@echo "  make linux-alpha           for Linux with Alpha optimizations"
 	@echo "  make linux-alpha-static    for Linux with Alpha opts, make static libs"
+	@echo "  make linux-ia64-ecc-static for Linux with IA64 opts, Intel compiler, static libs"
+	@echo "  make linux-ia64-ecc-static-nothreads for Linux with IA64 opts, Intel compiler, static, no threads"
 	@echo "  make linux-ppc             for Linux with PowerPC opts"
 	@echo "  make linux-ppc-static      for Linux with PowerPC opts, make static libs"
 	@echo "  make linux-sparc           for Linux with Sparc optimzations"
@@ -78,12 +97,17 @@ default:
 	@echo "  make linux-osmesa32        for 32-bit/channel OSMesa"
 	@echo "  make linux-solo            for Linux standalone with DRI drivers"
 	@echo "  make linux-icc             for Linux with the Intel C/C++ compiler"
+	@echo "  make linux-icc-static      for Linux with the Intel C/C++ compiler, static libs"
+	@echo "  make linux-icc-static-nothreads  for Linux with the Intel C/C++ compiler, static, no threads"
+	@echo "  make linux-ia64-ecc-static for Linux IA64 with the Intel C/C++ compiler, static libs"
+	@echo "  make linux-ia64-ecc-static-nothreads  for Linux IA64 with the Intel C/C++ compiler, static, no threads"
 	@echo "  make lynxos                for LynxOS systems with GCC"
 	@echo "  make mklinux               for Linux on Power Macintosh"
 	@echo "  make netbsd                for NetBSD 1.0 systems with GCC"
 	@echo "  make openbsd               for OpenBSD systems"
 	@echo "  make openstep              for OpenStep/MacOSX Server systems"
 	@echo "  make osf1                  for DEC Alpha systems with OSF/1"
+	@echo "  make osf1-nothreads        for DEC Alpha systems with OSF/1, no threads"
 	@echo "  make qnx                   for QNX V4 systems with Watcom compiler"
 	@echo "  make solaris-x86           for PCs with Solaris"
 	@echo "  make solaris-x86-gcc       for PCs with Solaris using GCC"
@@ -95,6 +119,10 @@ default:
 	@echo "  make sunos5-smp            for Suns with SunOS 5.x, SMP optimization"
 	@echo "  make sunos5-gcc            for Suns with SunOS 5.x and GCC"
 	@echo "  make sunos5-gcc-debug      for Suns with SunOS 5.x and GCC"
+	@echo "  make sunos5-v8             for Suns with SunOS 5.x, 32-bit V8 no threads"
+	@echo "  make sunos5-v8-pthread     for Suns with SunOS 5.x, 32-bit V8 with threads"
+	@echo "  make sunos5-v9             for Suns with SunOS 5.x, 64-bit V8 no threads"
+	@echo "  make sunos5-v9-pthread     for Suns with SunOS 5.x, 64-bit V8 with threads"
 	@echo "  make ultrix-gcc            for DEC systems with Ultrix and GCC"
 	@echo "  make unixware              for PCs running UnixWare"
 	@echo "  make unixware-shared       for PCs running UnixWare, shared libs"
@@ -106,20 +134,28 @@ default:
 # XXX we may have to split up this group of targets into those that
 # have a C++ compiler and those that don't for the SI-GLU library.
 
-aix aix-sl aix-gcc darwin freebsd freebsd-386 gcc-sl \
+aix aix-nothreads aix-sl aix-gcc darwin freebsd freebsd-386 gcc-sl \
+darwin-static darwin-static-nothreads \
 cygnus cygnus-linux \
 hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \
 hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \
+hpux11-32 hpux11-32-nothreads \
+irix6-o32 irix6-o32-nothreads \
 linux linux-debug linux-static \
-linux-x86 linux-x86-sse linux-icc linux-x86-static linux-x86-debug \
+linux-x86 linux-x86-sse \
+linux-x86-static linux-x86-debug linux-x86-static-nothreads \
+linux-icc linux-icc-static linux-icc-static-nothreads \
+linux-ia64-ecc-static linux-ia64-ecc-static-nothreads \
+linux-x86-64-static linux-x86-64-static-nothreads \
 linux-glide linux-x86-glide linux-glide-debug \
 linux-alpha-static linux-alpha \
 linux-ppc-static linux-ppc \
 linux-sparc linux-sparc5 linux-sparc-ultra \
-mklinux netbsd osf1 openbsd qnx \
+mklinux netbsd osf1 osf1-nothreads openbsd qnx \
 solaris-x86 solaris-x86-gcc \
 sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \
 sunos5 sunos5-smp sunos5-gcc sunos5-gcc-debug \
+sunos5-v8 sunos5-v8-pthread \
 ultrix-gcc unixware:
 	-mkdir lib
 	if [ -d src/mesa ] ; then \
@@ -164,7 +200,7 @@ gcc-mesa-sl:
 	if [ -d src ] ; then cd src  ; $(MAKE) -f Makefile.X11 $@ ; fi
 
 
-irix6-o32 irix6-o32-dso irix6-n32 irix6-n32-dso irix6-gcc-n32-sl:
+irix6-n32 irix6-n32-nothreads irix6-n32-dso irix6-gcc-n32-sl:
 	-mkdir lib32
 	if [ -d src/mesa ] ; then \
 		cd src/mesa ; \
@@ -203,7 +239,9 @@ irix6-o32 irix6-o32-dso irix6-n32 irix6-n32-dso irix6-gcc-n32-sl:
 		$(MAKE) -f Makefile.X11 $@ ; \
 	fi
 
-irix6-64 irix6-64-dso:
+aix-64 aix-64-nothreads hpux11-64 hpux11-64-nothreads irix6-64 \
+irix6-64-nothreads  irix6-64-dso hpux11-ia64 hpux11-ia64-nothreads \
+sunos5-v9 sunos5-v9-pthread:
 	-mkdir lib64
 	if [ -d src/mesa ] ; then \
 		cd src/mesa ; \