Changeset 15260

Timestamp:

06/13/13 16:03:35 (12 years ago)

Author:

Eric.Larour

Message:

CHG: fixing issue with NR on linux

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (3 diffs)

issm/trunk-jpl/m4/issm_options.m4 ¶

@@ -60 +60 @@
                         export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
                         export AR="ar-lib lib"
-         export OS_LDFLAG="-Wl,"
+                        export OS_LDFLAG="-Wl,"
                         export RANLIB=true
                         OSLIBS="-Wl,kernel32.lib -Wl,user32.lib -Wl,gdi32.lib -Wl,winspool.lib -Wl,comdlg32.lib -Wl,advapi32.lib -Wl,shell32.lib -Wl,ole32.lib -Wl,oleaut32.lib -Wl,uuid.lib -Wl,odbc32.lib -Wl,odbccp32.lib"
@@ -69 +69 @@
                         export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
                         export AR="ar-lib lib"
-         export OS_LDFLAG="-Wl,"
+                        export OS_LDFLAG="-Wl,"
                         export RANLIB=true
                         OSLIBS="-Wl,kernel32.lib -Wl,user32.lib -Wl,gdi32.lib -Wl,winspool.lib -Wl,comdlg32.lib -Wl,advapi32.lib -Wl,shell32.lib -Wl,ole32.lib -Wl,oleaut32.lib -Wl,uuid.lib -Wl,odbc32.lib -Wl,odbccp32.lib"
@@ -619 +619 @@
                         *linux*)
                         if test $PETSC_MAJOR -lt 3 ; then
-                                PETSCLIB="-L$PETSC_ROOT/lib libpetscksp.lib libpetscdm.lib libpetscmat.lib libpetscvec.lib libpetscsnes.lib libpetscts.lib libmpiuni.lib libpetsc.lib"
+                                PETSCLIB="-L$PETSC_ROOT/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lmpiuni -lpetsc"
                         else
-                                PETSCLIB="-L$PETSC_ROOT/lib libpetsc.lib"
+                                PETSCLIB="-L$PETSC_ROOT/lib -lpetsc -ldll"
                                 if test $PETSC_MAJOR -gt 3 || test $PETSC_MINOR -ge 3; then PETSCLIB+=" -lmetis"; fi
                         fi