Index: ../trunk-jpl/jenkins/linux64_murdo_ampi
===================================================================
--- ../trunk-jpl/jenkins/linux64_murdo_ampi	(revision 18400)
+++ ../trunk-jpl/jenkins/linux64_murdo_ampi	(revision 18401)
@@ -20,12 +20,12 @@
 				  --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
 				  --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
 				  --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" \
-				  --with-graphics-lib="/usr/lib/x86_64-linux-gnu/libX11.so" \
 				  --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
 				  --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
 				  --with-numthreads=18  \
 				  --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
 				  --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+				  --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.6/ -lgfortran" \
 				  --enable-development \
 				  --enable-debugging CXXFLAGS="-g -O0" '
 #MATLAB path
Index: ../trunk-jpl/configure.ac
===================================================================
--- ../trunk-jpl/configure.ac	(revision 18400)
+++ ../trunk-jpl/configure.ac	(revision 18401)
@@ -5,19 +5,16 @@
 AC_CONFIG_AUX_DIR([./aux-config])         #Put config files in aux-config
 AC_CONFIG_MACRO_DIR([m4])                 #m4 macros are located in m4
 m4_include([m4/issm_options.m4])
-AC_CANONICAL_TARGET                       #Determine the system type
 
+#Determine System type and OS
+AC_CANONICAL_TARGET
+
 #Compilers
 AC_PROG_CC([icc cccl cl icl gcc])
 AC_PROG_CPP
 AC_PROG_CXX([icpc cccl cl icl g++])
 AC_PROG_F77([ifort g77 gfortran])
 
-#AC_F77_LIBRARY_LDFLAGS
-
-#Libraries and linking
-#AC_PATH_XTRA      #figure out X library and include paths
-
 #AUTOMAKE
 #Initialize automake and declare foreign so that we don't need a ChangeLog, INSTALL, etc
 AM_INIT_AUTOMAKE([foreign])
