From 843dafdba5e40a2b5cf905ee7ce76fbf8cec8c1c Mon Sep 17 00:00:00 2001 From: young Date: Thu, 2 Dec 2010 10:48:05 +0000 Subject: [PATCH] Fix bug in mpi consistency for PETSc 2.3.x git-svn-id: https://svn.dealii.org/trunk@22899 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 6f8b2c0f5b..05bde9760c 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -5720,9 +5720,21 @@ AC_DEFUN(DEAL_II_CHECK_PETSC_MPI_CONSISTENCY, dnl dnl First, get PETSc's language type AC_MSG_CHECKING([for PETSc library language]) - DEAL_II_PETSC_LANGUAGE=`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_LANGUAGE=`cat $DEAL_II_PETSC_DIR/bmake/$DEAL_II_PETSC_ARCH/petscconf \ + | grep "PETSC_LANGUAGE = " \ + | perl -pi -e 's/.*LANGUAGE\s=\s+//g;'` + ;; + 3.*) dnl + DEAL_II_PETSC_LANGUAGE=`cat $DEAL_II_PETSC_DIR/$DEAL_II_PETSC_ARCH/conf/petscvariables \ | grep "PETSC_LANGUAGE = " \ | perl -pi -e 's/.*LANGUAGE\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 dnl ...and pretty print that. case "$DEAL_II_PETSC_LANGUAGE" in -- 2.39.5