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
  • proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4

     
    604604                AC_MSG_CHECKING(for PETSc version)
    605605                PETSC_MAJOR=`cat $PETSC_ROOT/include/petscversion.h | grep "#define PETSC_VERSION_MAJOR" | sed 's/#define PETSC_VERSION_MAJOR//' | sed 's/ //g'`
    606606                PETSC_MINOR=`cat $PETSC_ROOT/include/petscversion.h | grep "#define PETSC_VERSION_MINOR" | sed 's/#define PETSC_VERSION_MINOR//' | sed 's/ //g'`
    607                 AC_DEFINE_UNQUOTED([_PETSC_MAJOR_],$PETSC_MAJOR,[ Petsc version major])
    608                 AC_DEFINE_UNQUOTED([_PETSC_MINOR_],$PETSC_MINOR,[ Petsc version minor])
     607                AC_DEFINE_UNQUOTED([_PETSC_MAJOR_],$PETSC_MAJOR,[PETSc version major])
     608                AC_DEFINE_UNQUOTED([_PETSC_MINOR_],$PETSC_MINOR,[PETSc version minor])
    609609                AC_MSG_RESULT($PETSC_MAJOR.$PETSC_MINOR)
    610610
    611611                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' `
    612                 AC_MSG_CHECKING(if PETSc is the development version)
     612                AC_MSG_CHECKING(wether PETSc is the development version)
    613613                if test x$PETSC_VERSION_DATE_HG = xunknown; then
    614614                        AC_DEFINE([_HAVE_PETSCDEV_],[1],[with PETSc-dev])
    615615                        AC_MSG_RESULT(yes)
    616616                else
    617617                        AC_MSG_RESULT(no)
    618618                fi
    619 
    620619        fi
    621620       
    622621        AC_ARG_WITH([petsc-arch],
    623622          AS_HELP_STRING([--with-petsc-arch = DIR],[PETSc arch , necessary for parallel build]),
    624623          [PETSC_ARCH=$withval],[PETSC_ARCH=""])
    625624
    626         AC_MSG_CHECKING(for Petsc headers and libraries in $PETSC_ROOT for architecture $PETSC_ARCH)
     625        AC_MSG_CHECKING(for PETSc headers and libraries in $PETSC_ROOT for architecture $PETSC_ARCH)
    627626       
    628627        if test -d "$PETSC_ROOT"; then
    629628
     
    653652                        ;;
    654653                esac
    655654
    656                 AC_DEFINE([_HAVE_PETSC_],[1],[with Petsc in ISSM src])
     655                AC_DEFINE([_HAVE_PETSC_],[1],[with PETSc in ISSM src])
    657656                AC_SUBST([PETSCINCL])
    658657                AC_SUBST([PETSCLIB])
    659658
     
    12231222        AC_MSG_RESULT($HAVE_3D)
    12241223        dnl }}}
    12251224        dnl checks{{{
    1226         AC_MSG_CHECKING(checking consistency between all libraries)
     1225        AC_MSG_CHECKING(consistency between all libraries)
    12271226       
    12281227        dnl check that if petsc is requested in parallel, mpi should be specified
    12291228        if test "$HAVE_PETSC" = "yes" ; then
Note: See TracBrowser for help on using the repository browser.