--- user.make.orig	Wed Jul 12 14:22:11 2000
+++ user.make	Wed Mar 14 16:07:25 2001
@@ -2,22 +2,23 @@
 # by configure in system.make.  At a minimum you should set
 # the following Tcl/Tk values if you are planning to use Tcl/Tk
 
-TCL_INCLUDE=-I/home/ausable/software/src/tcl7.6/tcl7.6/generic
-TCL_LIB=/common/software/tcl7.6/sun4/5.4/lib/libtcl7.6.a
+TCL_INCLUDE=-I${PREFIX}/include/tcl8.3/generic
+TCL_LIB=-L${PREFIX}/lib -ltcl83
 
-TK_INCLUDE=-I/home/ausable/software/src/tcl7.6/tk4.2/generic
-TK_LIB=/common/software/tk4.2/sun4/5.4/lib/libtk4.2.a
+TK_INCLUDE=-I${PREFIX}/include/tk8.3/generic
+TK_LIB=-L${PREFIX}/lib -ltk83
 
-MESA_INCLUDE=-I/home/martink/storage/Mesa-1.2.6/include
-MESA_LIB=/home/martink/storage/Mesa-1.2.6/lib-sun4-solaris/libMesaGL.a
+MESA_INCLUDE=-I${X11BASE}/include
+MESA_LIB=-L${X11BASE} -lGL
 
 # for python you must set this 
-PYTHON_INCLUDES=-I/home/schroede/montnaro/Python-1.4/Include
+PYTHON_INCLUDES=-I%%PYTHON_INCLUDEDIR%%
 
 # Add additional CFLAGS and CXXFLAGS for compilation
 # uncomment the following two lines to set your own flags
-#USER_CFLAGS =  
-#USER_CXXFLAGS = 
+USER_CFLAGS =  -O2 -D__NO_MATH_INLINES %%PTHREAD_CFLAGS%%
+USER_CXXFLAGS = -O2 -D__NO_MATH_INLINES %%PTHREAD_CFLAGS%%
+X_EXTRA_LIBS = -lstdc++ -lgcc %%PTHREAD_LIBS%%
 
 # if you want to try the java support you'll need to set the following
 # variables to match your environment and uncomment them