From ef726be33ab4a8e06b37ea199dd0aec5e3221906 Mon Sep 17 00:00:00 2001 From: "Toby D. Young" Date: Fri, 8 Oct 2010 13:48:17 +0000 Subject: [PATCH] Correct position of PETSC_MPI_CONSISTENCY. Still no functionality... (TODO) git-svn-id: https://svn.dealii.org/trunk@22293 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 15 +++++++++++++++ deal.II/configure.in | 3 --- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 364aa27a29..166e8337d7 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -5561,6 +5561,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_PETSC, dnl if test "$USE_CONTRIB_PETSC" = "yes" ; then DEAL_II_CONFIGURE_PETSC_VERSION DEAL_II_CONFIGURE_PETSC_ARCH + DEAL_II_CHECK_PETSC_MPI_CONSISTENCY DEAL_II_CONFIGURE_PETSC_MPIUNI_LIB DEAL_II_CONFIGURE_PETSC_COMPLEX @@ -5675,6 +5676,20 @@ AC_DEFUN(DEAL_II_CONFIGURE_PETSC_VERSION, dnl ]) +dnl ------------------------------------------------------------- +dnl Make sure that if PETSc was built with/without MPI, then +dnl deal.II was built with the same flags. +dnl +dnl Usage: DEAL_II_CHECK_PETSC_MPI_CONSISTENCY +dnl +dnl ------------------------------------------------------------- +AC_DEFUN(DEAL_II_CHECK_PETSC_MPI_CONSISTENCY, dnl +[ +dnl TODO: This does nothing yet. Add this functionality asap +dnl (Toby D. Young) +]) + + dnl ------------------------------------------------------------ dnl See if there is a library libmpiuni.a/so available. We need dnl to link with it on some systems where PETSc is built without diff --git a/deal.II/configure.in b/deal.II/configure.in index 0b5e9b2648..70c8fd3bb4 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -618,9 +618,6 @@ DEAL_II_CHECK_CPU_OPTIMIZATIONS dnl Last check: test whether CXXFLAGS and F77FLAGS are ok DEAL_II_CHECK_CXXFLAGS_CONSISTENCY DEAL_II_CHECK_F77FLAGS_CONSISTENCY -DEAL_II_CHECK_PETSC_MPI_CONSISTENCY - - dnl ------------------------------------------------------------- dnl Third party programs -- 2.39.5