Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 =================================================================== --- /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 (revision 11916) +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 (revision 11917) @@ -604,26 +604,25 @@ AC_MSG_CHECKING(for PETSc version) PETSC_MAJOR=`cat $PETSC_ROOT/include/petscversion.h | grep "#define PETSC_VERSION_MAJOR" | sed 's/#define PETSC_VERSION_MAJOR//' | sed 's/ //g'` PETSC_MINOR=`cat $PETSC_ROOT/include/petscversion.h | grep "#define PETSC_VERSION_MINOR" | sed 's/#define PETSC_VERSION_MINOR//' | sed 's/ //g'` - AC_DEFINE_UNQUOTED([_PETSC_MAJOR_],$PETSC_MAJOR,[ Petsc version major]) - AC_DEFINE_UNQUOTED([_PETSC_MINOR_],$PETSC_MINOR,[ Petsc version minor]) + AC_DEFINE_UNQUOTED([_PETSC_MAJOR_],$PETSC_MAJOR,[PETSc version major]) + AC_DEFINE_UNQUOTED([_PETSC_MINOR_],$PETSC_MINOR,[PETSc version minor]) AC_MSG_RESULT($PETSC_MAJOR.$PETSC_MINOR) 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' ` - AC_MSG_CHECKING(if PETSc is the development version) + AC_MSG_CHECKING(wether PETSc is the development version) if test x$PETSC_VERSION_DATE_HG = xunknown; then AC_DEFINE([_HAVE_PETSCDEV_],[1],[with PETSc-dev]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) fi - fi AC_ARG_WITH([petsc-arch], AS_HELP_STRING([--with-petsc-arch = DIR],[PETSc arch , necessary for parallel build]), [PETSC_ARCH=$withval],[PETSC_ARCH=""]) - AC_MSG_CHECKING(for Petsc headers and libraries in $PETSC_ROOT for architecture $PETSC_ARCH) + AC_MSG_CHECKING(for PETSc headers and libraries in $PETSC_ROOT for architecture $PETSC_ARCH) if test -d "$PETSC_ROOT"; then @@ -653,7 +652,7 @@ ;; esac - AC_DEFINE([_HAVE_PETSC_],[1],[with Petsc in ISSM src]) + AC_DEFINE([_HAVE_PETSC_],[1],[with PETSc in ISSM src]) AC_SUBST([PETSCINCL]) AC_SUBST([PETSCLIB]) @@ -1223,7 +1222,7 @@ AC_MSG_RESULT($HAVE_3D) dnl }}} dnl checks{{{ - AC_MSG_CHECKING(checking consistency between all libraries) + AC_MSG_CHECKING(consistency between all libraries) dnl check that if petsc is requested in parallel, mpi should be specified if test "$HAVE_PETSC" = "yes" ; then