1 --- mesa/Make-config.orig 2004-06-25 13:09:44.000000000 +0100
2 +++ mesa/Make-config 2004-06-25 14:18:27.000000000 +0100
4 "GLUT_LIB = libglut.so" \
5 "GLW_LIB = libGLw.so" \
6 "OSMESA_LIB = libOSMesa.so" \
9 - "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
10 - "CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
13 + "CFLAGS = -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS $(CFLAGS)" \
14 + "CXXFLAGS = -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE $(CXXFLAGS)" \
15 "GLUT_CFLAGS = -fexceptions" \
16 - "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
17 + "GL_LIB_DEPS = $(LDFLAGS) -lX11 -lXext -lm -lpthread" \
18 "OSMESA_LIB_DEPS = -L$(TOP)/lib -lGL" \
19 "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
20 - "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
21 - "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \
22 + "GLUT_LIB_DEPS = $(LDFLAGS) -L$(TOP)/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm" \
23 + "GLW_LIB_DEPS = $(LDFLAGS) -L$(TOP)/lib -lGL -lXt -lX11" \
24 "APP_LIB_DEPS = -lglut -lGLU -lGL -lm"