--- common.am	2011-06-30 01:03:12.735914674 -0600
+++ my.common.am	2011-06-30 00:48:26.420616197 -0600
@@ -19,7 +19,7 @@
 	-DSTR_LEN_AT_END
 
 AM_CXXFLAGS = \
-	-std=c++98 \
+	-std=gnu++98 \
 	-D_GNU_SOURCE \
 	-O2 \
 	-DSTR_LEN_AT_END
@@ -83,12 +83,13 @@
 #   This problem is solved by adding the -ldl flag in the related Makefile.am
 
 # 32 bit:
-FCLIBS = -L/opt/intel/Compiler/11.0/081/lib/ia32
-MPILIBS = -L/opt/mpich2/lib -lmpichf90 -lmpich -lpthread
+# FCLIBS = -L/opt/intel/Compiler/11.0/081/lib/ia32
+# MPILIBS = -L/opt/mpich2/lib -lmpichf90 -lmpich -lpthread
 
 # 64 bit:
-# FCLIBS = -L/opt/intel/Compiler/11.0/081/lib/intel64
-# MPILIBS = -L/opt/mpich2-1.0.8-intel64/lib -lmpichf90 -lmpich -lpthread
+FCLIBS = -L/usr/local/intel/lib/intel64
+MPILIBS = -L/usr/local/mvapich2-1.5.1-intel/lib -lmpichf90 -lmpich -lpthread
+
 
 #-------------------------------------------------------------------------------
 #   Custom make targets