Changeset 18401

Timestamp:

08/15/14 11:19:38 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: final adjustements

Location:

issm/trunk-jpl

Files:

• configure.ac (modified) (2 diffs)
• jenkins/linux64_murdo_ampi (modified) (2 diffs)

issm/trunk-jpl/configure.ac

@@ -6 +6 @@
 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
@@ -13 +15 @@
 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

issm/trunk-jpl/jenkins/linux64_murdo_ampi

@@ -21 +21 @@
                                   --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 \
@@ -27 +26 @@
                                   --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" '