source: issm/oecreview/Archive/13393-13976/ISSM-13785-13786.diff@ 14312

../trunk-jpl/configs/config-macosx64-chris-bothapis.sh

@@ -7 +7 @@
 
 ./configure \
         --prefix=$ISSM_DIR \
+        --with-matlab-dir=$MATLAB_DIR \
+        --with-python-dir=$ISSM_DIR/externalpackages/python/install \
+        --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/Library/Frameworks/Python.framework/Versions/$pythonversion/lib/python$pythonversion/site-packages/numpy\
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-        --with-matlab-dir=$MATLAB_DIR \
-        --with-python-dir=$ISSM_DIR/externalpackages/python/install\
-        --with-python-version=$pythonversion \
-        --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy\
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
         --with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
         --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
-        --with-fortran-lib="/usr/local/gfortran/lib/gcc/x86_64-apple-darwin10/4.6.2/libgfortran.a" \
+        --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
         --with-math-lib="/usr/lib/libm.dylib" \
         --with-graphics-lib="/usr/X11/lib/libX11.dylib" \
         --with-cxxoptflags=" -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5  -O3 -DNDEBUG -w "\
@@ -27 +26 @@
         --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
         --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
-        --with-numthreads=8
-        #--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
-        #--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
-        #--with-boost-dir=$ISSM_DIR/externalpackages/boost/install/ \
+        #--with-fortran-lib="/usr/local/gfortran/lib/gcc/x86_64-apple-darwin10/4.6.2/libgfortran.a" \
+        #--with-python-version=$pythonversion \