From: Toby D. Young Date: Thu, 2 Dec 2010 11:03:21 +0000 (+0000) Subject: Fix bug in mpi consistency for PETSc 2.3.x X-Git-Tag: v8.0.0~4759 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59c2b3439786527bc560b5cca74a4ae933cd592b;p=dealii.git Fix bug in mpi consistency for PETSc 2.3.x git-svn-id: https://svn.dealii.org/trunk@22900 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 05bde9760c..4b8b973f45 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -5756,9 +5756,23 @@ AC_DEFUN(DEAL_II_CHECK_PETSC_MPI_CONSISTENCY, dnl dnl about is stored in the PCC (PCC_LINKER) flags. So we just check that dnl this valus is the same as the corresponding value for the C/C++ dnl compiler that deal.II knows about. - DEAL_II_PETSC_PCC=`cat $DEAL_II_PETSC_DIR/$DEAL_II_PETSC_ARCH/conf/petscvariables \ + case "${DEAL_II_PETSC_VERSION_MAJOR}.${DEAL_II_PETSC_VERSION_MINOR}.${DEAL_II_PETSC_VERSION_SUBMINOR}" in + 2.3*) dnl + DEAL_II_PETSC_PCC=`cat $DEAL_II_PETSC_DIR/bmake/$DEAL_II_PETSC_ARCH/petscconf \ + | grep "PCC = " \ + | perl -pi -e 's/.*PCC\s=\s+//g;'` + ;; + 3.*) dnl + DEAL_II_PETSC_PCC=`cat $DEAL_II_PETSC_DIR/$DEAL_II_PETSC_ARCH/conf/petscvariables \ | grep "PCC = " \ | perl -pi -e 's/.*PCC\s=\s+//g;'` + + ;; + *) dnl + AC_MSG_ERROR([Unknown PETSc version ${DEAL_II_PETSC_VERSION_MAJOR}.${DEAL_II_PETSC_VERSION_MINOR}.${DEAL_II_PETSC_VERSION_SUBMINOR}]) + ;; + esac + DEAL_II_PETSC_PCC+=" " dnl Add a trailing whitespace case "$DEAL_II_PETSC_LANGUAGE" in