--- Makefile.config.ORIG	2011-06-16 15:58:59.000000000 -0300
+++ Makefile.config	2011-06-16 17:19:25.000000000 -0300
@@ -116,7 +116,7 @@
 ########################################################################
 # Large file support, see Portability/README_LARGE_FILES for more info 
 # Default, do not assume LARGE_FILES 
-LARGE_FILE_FLAG = 
+#LARGE_FILE_FLAG = 
 
 # uncomment if you want to install with large file support
 # RedHat and likely other Linux
@@ -165,7 +165,7 @@
 OPTC = -O 
 
 # O3 optimization full ansi (Linux) Posix-compliant only
-OPTC = -O3 -Wall -Wno-long-long -ansi -pedantic -D_POSIX_SOURCE
+#OPTC = -O3 -Wall -Wno-long-long -ansi -pedantic -D_POSIX_SOURCE
 
 # O optimization full ansi (Linux) Posix-compliant only
 # more robust. Use this if you have trouble with the X-windows tools
@@ -189,7 +189,7 @@
 # this includes, Free BSD, Open BSD, Mac OS X and CYGWIN32, 
 # Debian and Debian derived  including UBUNTU
 # although, you might want to just use -O optimization
-#OPTC = -O3 -Wall -ansi -pedantic 
+OPTC = -O2 -Wall -ansi -pedantic 
 #...or...
 #OPTC = -O -Wall -ansi -pedantic 
 
@@ -304,13 +304,13 @@
 #LD_LIBRARY_PATH = /usr/lang/SC2.0.1patch:/usr/lib/X11R5
 
 # under SUN OS and Linux  uncomment the next line
-#LD_LIBRARY_PATH += $(CWPROOT)/lib:/usr/local/lesstif/lib
+LD_LIBRARY_PATH += $(CWPROOT)/lib:/usr/lib
 
 # under AIX on IBM  uncomment the next line
 #LD_LIBRARY_PATH = $(CWPROOT)/lib:/usr/X11R6/LessTif/lib
 
 # under SUN OS and RedHat (and other) Linux  uncomment the next line
-LD_LIBRARY_PATH += $(CWPROOT)/lib:/usr/X11R6/LessTif/lib
+#LD_LIBRARY_PATH += $(CWPROOT)/lib:/usr/X11R6/LessTif/lib
 
 #############################################################################
 # the archiver
@@ -348,11 +348,11 @@
 # Default C preprocessor (cpp) definition
 # this is the one you will use on most systems
 # AIX, IRIX if using the native cc compiler, Linux
-CPP = /lib/cpp
+#CPP = /lib/cpp
 
 # under CYGWIN32, this seems like shooting at a moving target.
 # one possibility is to simply uncomment the next line
-# CPP = /usr/bin/cpp
+CPP = /usr/bin/cpp
 
 # under Solaris, IRIX, AIX, and possibly other with gcc compiler, use:
 #CPP = gcc -E
@@ -382,12 +382,12 @@
 # the Fortran codes to work properly. You may need to experiment.
 #
 # Default for IBM RS6000, SGI, also for the Intel compiler ifort
-OPTF = -O
+#OPTF = -O
 
 # Default for Linux and other GCC installs (most likely FreeBSD and Mac OS X)
 # with g77
-#OPTF = -O -static -mcpu=i686 -fno-globals -fno-automatic -fno-second-underscore
-OPTF = -static -fno-automatic -fno-second-underscore
+OPTF = -O -static -march=i686 -fno-second-underscore
+#OPTF = -static -fno-automatic -fno-second-underscore
 #OPTF = -static  -m64 -fno-automatic -fno-second-underscore
 
 # use this one for gfortn
@@ -445,10 +445,10 @@
 ####
 # Generic (RS6000, SGI)
 # X11 include path
-IX11 = /usr/local/include
+#IX11 = /usr/local/include
 
 # X11 library path
-LX11 = /usr/local/lib
+#LX11 = /usr/local/lib
 ####
 
 ####
@@ -466,10 +466,10 @@
 ## The following paths would be used under Linux
 ## and possibly under SCO Unix installs
 # X11 include path
-IX11 = /usr/X11R6/include
+IX11 = /usr/include/X11
 
 # X11 library path
-LX11 = /usr/X11R6/lib
+LX11 = /usr/lib/X11
 
 
 ####
@@ -488,39 +488,39 @@
 # if you have these include files and libraries. 
 #
 # include path
-IMOTIF = /usr/local/include
+IMOTIF = /usr/include/X11
 
 # library path
-LMOTIF = /usr/local/lib
+LMOTIF = /usr/lib/X11
 
 # Example of Lesstif usage:
 # include path 
-IMOTIF = /usr/local/lesstif/include
+#IMOTIF = /usr/local/lesstif/include
 
 # library path
-LMOTIF = /usr/local/lesstif/lib
+#LMOTIF = /usr/local/lesstif/lib
 
 #### Example of Lesstif usage under RedHat
 # include path 
-IMOTIF = /usr/X11R6/LessTif/Motif2.0/include
+#IMOTIF = /usr/X11R6/LessTif/Motif2.0/include
 
 # library path
-LMOTIF = /usr/X11R6/LessTif/Motif2.0/lib
+#LMOTIF = /usr/X11R6/LessTif/Motif2.0/lib
 
 
 #### Open GL/Mesa include and library paths (generic example)
 # Open GL/Mesa include path
-IGL = /usr/local/include
+#IGL = /usr/local/include
 
 # Open GL/Mesa library path
-LGL = /usr/local/lib
+#LGL = /usr/local/lib
 
 ## GLUT include and library paths
 # include path
-IGLUT = /usr/local/include
+#IGLUT = /usr/local/include
 
 # library path
-LGLUT = /usr/local/lib
+#LGLUT = /usr/local/lib
 
 #### examples for SGI with glut installed in /usr/local/glut-3.3 
 ## GLUT include and library paths