[13980] | 1 | Index: ../trunk-jpl/configs/config-macosx64-chris-bothapis.sh
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/configs/config-macosx64-chris-bothapis.sh (revision 13785)
|
---|
| 4 | +++ ../trunk-jpl/configs/config-macosx64-chris-bothapis.sh (revision 13786)
|
---|
| 5 | @@ -7,16 +7,15 @@
|
---|
| 6 |
|
---|
| 7 | ./configure \
|
---|
| 8 | --prefix=$ISSM_DIR \
|
---|
| 9 | + --with-matlab-dir=$MATLAB_DIR \
|
---|
| 10 | + --with-python-dir=$ISSM_DIR/externalpackages/python/install \
|
---|
| 11 | + --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/Library/Frameworks/Python.framework/Versions/$pythonversion/lib/python$pythonversion/site-packages/numpy\
|
---|
| 12 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 13 | - --with-matlab-dir=$MATLAB_DIR \
|
---|
| 14 | - --with-python-dir=$ISSM_DIR/externalpackages/python/install\
|
---|
| 15 | - --with-python-version=$pythonversion \
|
---|
| 16 | - --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy\
|
---|
| 17 | --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
|
---|
| 18 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
|
---|
| 19 | --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 " \
|
---|
| 20 | --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
|
---|
| 21 | - --with-fortran-lib="/usr/local/gfortran/lib/gcc/x86_64-apple-darwin10/4.6.2/libgfortran.a" \
|
---|
| 22 | + --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
|
---|
| 23 | --with-math-lib="/usr/lib/libm.dylib" \
|
---|
| 24 | --with-graphics-lib="/usr/X11/lib/libX11.dylib" \
|
---|
| 25 | --with-cxxoptflags=" -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w "\
|
---|
| 26 | @@ -27,7 +26,5 @@
|
---|
| 27 | --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 28 | --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 29 | --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 30 | - --with-numthreads=8
|
---|
| 31 | - #--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
|
---|
| 32 | - #--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
|
---|
| 33 | - #--with-boost-dir=$ISSM_DIR/externalpackages/boost/install/ \
|
---|
| 34 | + #--with-fortran-lib="/usr/local/gfortran/lib/gcc/x86_64-apple-darwin10/4.6.2/libgfortran.a" \
|
---|
| 35 | + #--with-python-version=$pythonversion \
|
---|