source: issm/oecreview/Archive/11911-11918/ISSM-11916-11917.diff@ 11991

Last change on this file since 11991 was 11991, checked in by Eric.Larour, 13 years ago

oecreview from 11518 to present
File size: 2.3 KB
RevLine 
[11991]1Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4
2===================================================================
3--- /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 (revision 11916)
4+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 (revision 11917)
5@@ -604,26 +604,25 @@
6 AC_MSG_CHECKING(for PETSc version)
7 PETSC_MAJOR=`cat $PETSC_ROOT/include/petscversion.h | grep "#define PETSC_VERSION_MAJOR" | sed 's/#define PETSC_VERSION_MAJOR//' | sed 's/ //g'`
8 PETSC_MINOR=`cat $PETSC_ROOT/include/petscversion.h | grep "#define PETSC_VERSION_MINOR" | sed 's/#define PETSC_VERSION_MINOR//' | sed 's/ //g'`
9- AC_DEFINE_UNQUOTED([_PETSC_MAJOR_],$PETSC_MAJOR,[ Petsc version major])
10- AC_DEFINE_UNQUOTED([_PETSC_MINOR_],$PETSC_MINOR,[ Petsc version minor])
11+ AC_DEFINE_UNQUOTED([_PETSC_MAJOR_],$PETSC_MAJOR,[PETSc version major])
12+ AC_DEFINE_UNQUOTED([_PETSC_MINOR_],$PETSC_MINOR,[PETSc version minor])
13 AC_MSG_RESULT($PETSC_MAJOR.$PETSC_MINOR)
14
15 PETSC_VERSION_DATE_HG=`cat $PETSC_ROOT/include/petscversion.h | grep "#define PETSC_VERSION_DATE_HG" | sed 's/#define PETSC_VERSION_DATE_HG//' | sed 's/ //g' | sed -e 's/\"//g' `
16- AC_MSG_CHECKING(if PETSc is the development version)
17+ AC_MSG_CHECKING(wether PETSc is the development version)
18 if test x$PETSC_VERSION_DATE_HG = xunknown; then
19 AC_DEFINE([_HAVE_PETSCDEV_],[1],[with PETSc-dev])
20 AC_MSG_RESULT(yes)
21 else
22 AC_MSG_RESULT(no)
23 fi
24-
25 fi
26
27 AC_ARG_WITH([petsc-arch],
28 AS_HELP_STRING([--with-petsc-arch = DIR],[PETSc arch , necessary for parallel build]),
29 [PETSC_ARCH=$withval],[PETSC_ARCH=""])
30
31- AC_MSG_CHECKING(for Petsc headers and libraries in $PETSC_ROOT for architecture $PETSC_ARCH)
32+ AC_MSG_CHECKING(for PETSc headers and libraries in $PETSC_ROOT for architecture $PETSC_ARCH)
33
34 if test -d "$PETSC_ROOT"; then
35
36@@ -653,7 +652,7 @@
37 ;;
38 esac
39
40- AC_DEFINE([_HAVE_PETSC_],[1],[with Petsc in ISSM src])
41+ AC_DEFINE([_HAVE_PETSC_],[1],[with PETSc in ISSM src])
42 AC_SUBST([PETSCINCL])
43 AC_SUBST([PETSCLIB])
44
45@@ -1223,7 +1222,7 @@
46 AC_MSG_RESULT($HAVE_3D)
47 dnl }}}
48 dnl checks{{{
49- AC_MSG_CHECKING(checking consistency between all libraries)
50+ AC_MSG_CHECKING(consistency between all libraries)
51
52 dnl check that if petsc is requested in parallel, mpi should be specified
53 if test "$HAVE_PETSC" = "yes" ; then
Note: See TracBrowser for help on using the repository browser.