Changeset 2641

Timestamp:

11/11/09 11:00:23 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed compilation on darwin

File:

• issm/trunk/m4/issm_options.m4 (modified) (5 diffs)

issm/trunk/m4/issm_options.m4

@@ -77 +77 @@
                                 MEXEXT=".$MEXEXT"
                         ;;
-                        *darwin9.6.0*)
+                        *darwin*)
                                 MEXLIB=-L"$MATLAB_ROOT/bin/maci/ -lmex -lmx"
-                                MEXLINK="-Wl,-twolevel_namespace -undefined error -arch i386 -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -bundle -Wl,-exported_symbols_list,$MATLAB_ROOT/extern/lib/maci/mexFunction.map"
+                                dnl MEXLINK="-Wl,-twolevel_namespace -undefined error -arch i386 -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -bundle -Wl,-exported_symbols_list,$MATLAB_ROOT/extern/lib/maci/mexFunction.map"
+                                MEXLINK="-Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,$MATLAB_ROOT/extern/lib/maci/mexFunction.map"
+
                                 MEXEXT=`$MATLAB_ROOT/bin/mexext`
                                 MEXEXT=".$MEXEXT"
@@ -212 +214 @@
                         METISLIB=-L"$METIS_ROOT/ -lmetis"
                         ;;
-                        *darwin9.6.0*)
+                        *darwin*)
                         METISLIB=-L"$METIS_ROOT/ -lmetis"
                         ;;
@@ -304 +306 @@
                 case "${host_os}" in
                         *cygwin*)
-                        PETSCLIB="-link -LIBPATH:\"$PETSC_ROOT/$PETSC_ARCH/lib\" -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib/$PETSC_ARCH\" libpetscksp.lib  libpetscdm.lib  libpetscmat.lib  libpetscvec.lib libpetsc.lib  libpetscsnes.lib libpetscts.lib libmpiuni.lib"
+                        PETSCLIB="-link -LIBPATH:\"$PETSC_ROOT/$PETSC_ARCH/lib\" -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib/$PETSC_ARCH\" libpetscksp.lib  libpetscdm.lib  libpetscmat.lib  libpetscvec.lib libpetscsnes.lib libpetscts.lib libmpiuni.lib libpetsc.lib"
                         ;;
                         *linux*)
                         PETSCLIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetsc  -lpetscsnes -lpetscts"
                         ;;
-                        *darwin9.6.0*)
-                        PETSCLIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetsc  -lpetscsnes -lpetscts"
+                        *darwin*)
+                        PETSCLIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lpetsc"
                         ;;
                 esac
@@ -349 +351 @@
                         MPILIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lmpiuni"
                         ;;
-                        *darwin9.6.0*)
+                        *darwin*)
                         MPILIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lmpiuni"
                         ;;
@@ -435 +437 @@
                         BLASLAPACKLIB=-L"$BLASLAPACK_ROOT -lflapack -lfblas " 
                         ;;
-                        *darwin9.6.0*)
+                        *darwin*)
                         BLASLAPACKLIB=-L"$BLASLAPACK_ROOT -lflapack -lfblas " 
                         ;;