source: issm/oecreview/Archive/13393-13976/ISSM-13747-13748.diff@ 15393

Last change on this file since 15393 was 13980, checked in by Mathieu Morlighem, 12 years ago

preparing oecreview for 13393-13976'
File size: 3.6 KB
RevLine 
[13980]1Index: ../trunk-jpl/m4/issm_options.m4
2===================================================================
3--- ../trunk-jpl/m4/issm_options.m4 (revision 13747)
4+++ ../trunk-jpl/m4/issm_options.m4 (revision 13748)
5@@ -91,7 +91,7 @@
6 AC_SUBST([OSLIBS])
7 AC_MSG_RESULT(done)
8 dnl }}}
9- dnl Matlab{{{
10+ dnl matlab{{{
11
12 dnl 1. See if matlab has been provided
13 AC_ARG_WITH([matlab-dir],
14@@ -232,9 +232,11 @@
15 AC_MSG_CHECKING(for python)
16
17 if test -d "$PYTHON_ROOT"; then
18+ AC_MSG_RESULT($HAVE_PYTHON)
19 dnl defaults
20 HAVE_PYTHON3="no"
21- HAVE_PYTHON=yes
22+ HAVE_PYTHON="yes"
23+ AC_MSG_RESULT($HAVE_PYTHON)
24
25 AC_ARG_WITH([python-version],
26 AS_HELP_STRING([--with-python-version = PYTHONVERSION],[python version.]),
27@@ -275,11 +277,10 @@
28 AC_SUBST([PYTHONLINK])
29 else
30 HAVE_PYTHON=no
31+ AC_MSG_RESULT($HAVE_PYTHON)
32 fi
33 AM_CONDITIONAL([PYTHON], [test x$HAVE_PYTHON = xyes])
34 AM_CONDITIONAL([PYTHON3], [test x$HAVE_PYTHON3 = xyes])
35- AC_MSG_RESULT($HAVE_PYTHON)
36-
37 dnl }}}
38 dnl python-numpy{{{
39 AC_ARG_WITH([python-numpy-dir],
40@@ -578,36 +579,41 @@
41 dnl make getlinklibs
42 if test -d "$PETSC_ROOT"; then
43
44- PETSCINCL="-I$PETSC_ROOT/$PETSC_ARCH/include -I$PETSC_ROOT/include/$PETSC_ARCH/ -I$PETSC_ROOT/include -I$PETSC_ROOT/ -I$PETSC_ROOT/bmake/$PETSC_ARCH -I$PETSC_ROOT/src/mat/impls/dense/mpi/plapack/"
45+ PETSCINCL=" -I$PETSC_ROOT/include"
46+ dnl Add other location (maybe not needed anymore)
47+ if test -d "$PETSC_ROOT/$PETSC_ARCH/include"; then
48+ PETSCINCL+=" $PETSC_ROOT/$PETSC_ARCH/include"
49+ fi
50+ if test -d "$PETSC_ROOT/include/$PETSC_ARCH"; then
51+ PETSCINCL+=" $PETSC_ROOT/include/$PETSC_ARCH"
52+ fi
53
54- case "${host_os}" in
55+ case "${host_os}" in
56 *cygwin*)
57- if test "$PETSC_MAJOR" = "2" ; then
58- PETSCLIB="-link -LIBPATH:\"$PETSC_ROOT/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"
59+ if test $PETSC_MAJOR -lt 3 ; then
60+ PETSCLIB="-link -LIBPATH:\"$PETSC_ROOT/lib\" libpetscksp.lib libpetscdm.lib libpetscmat.lib libpetscvec.lib libpetscsnes.lib libpetscts.lib libmpiuni.lib libpetsc.lib"
61 else
62- PETSCLIB="-link -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib/$PETSC_ARCH\" libpetsc.lib"
63+ PETSCLIB="-link -LIBPATH:\"$PETSC_ROOT/lib\" libpetsc.lib"
64 fi
65 ;;
66 *linux*)
67- if test "$PETSC_MAJOR" = "2" ; then
68- PETSCLIB="-L$PETSC_ROOT/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetsc -lpetscsnes -lpetscts"
69+ if test $PETSC_MAJOR -lt 3 ; then
70+ PETSCLIB="-L$PETSC_ROOT/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetsc -lpetscsnes -lpetscts"
71 else
72- PETSCLIB="-L$PETSC_ROOT/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetsc -ldl"
73+ PETSCLIB="-L$PETSC_ROOT/lib -lpetsc -ldl"
74 fi
75 ;;
76 *darwin*)
77- if test "$PETSC_MAJOR" = "2" ; then
78- PETSCLIB="-L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH/ -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lpetsc"
79+ if test $PETSC_MAJOR -lt 3 ; then
80+ PETSCLIB="-L$PETSC_ROOT/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lpetsc"
81 else
82- PETSCLIB="-L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH/ -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetsc"
83+ PETSCLIB="-L$PETSC_ROOT/lib -lpetsc"
84 fi
85 ;;
86 esac
87-
88 AC_DEFINE([_HAVE_PETSC_],[1],[with PETSc in ISSM src])
89 AC_SUBST([PETSCINCL])
90 AC_SUBST([PETSCLIB])
91-
92 HAVE_PETSC=yes
93 else
94 HAVE_PETSC=no
Note: See TracBrowser for help on using the repository browser.