From 5f4649740649c6b2dc0b549902c83c41082dbd10 Mon Sep 17 00:00:00 2001 From: bangerth Date: Wed, 12 Oct 2011 02:36:38 +0000 Subject: [PATCH] Only allow using p4est if we also have MPI. git-svn-id: https://svn.dealii.org/trunk@24594 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 7 ++++++- deal.II/configure | 9 ++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 998e746664..93f8377885 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -7422,11 +7422,16 @@ AC_DEFUN(DEAL_II_CONFIGURE_P4EST, dnl if test "x$use_p4est" != "xno" ; then AC_MSG_RESULT(yes) + dnl Verify that the p4est files are actually there if test ! -d "${use_p4est}/DEBUG" -o ! -d "${use_p4est}/FAST" ; then - echo "${use_p4est}/DEBUG" AC_MSG_ERROR([p4est directories $use_p4est/DEBUG or $use_p4est/FAST not found]) fi + dnl Make sure that we have also enabled MPI + if test "x${DEAL_II_COMPILER_SUPPORTS_MPI}" != "x1" ; then + AC_MSG_ERROR([When using p4est you also need to enable MPI.]) + fi + dnl Right now, we always build p4est as shared lib, so make sure we dnl have built deal.II as a shared lib as well if test "x$enableshared" != "xyes" ; then diff --git a/deal.II/configure b/deal.II/configure index 9f0af88102..622892f8cb 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 24287 . +# From configure.in Revision: 24565 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.68 for deal.II 7.2.pre. # @@ -11281,11 +11281,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - if test ! -d "${use_p4est}/DEBUG" -o ! -d "${use_p4est}/FAST" ; then - echo "${use_p4est}/DEBUG" + if test ! -d "${use_p4est}/DEBUG" -o ! -d "${use_p4est}/FAST" ; then as_fn_error $? "p4est directories $use_p4est/DEBUG or $use_p4est/FAST not found" "$LINENO" 5 fi + if test "x${DEAL_II_COMPILER_SUPPORTS_MPI}" != "x1" ; then + as_fn_error $? "When using p4est you also need to enable MPI." "$LINENO" 5 + fi + if test "x$enableshared" != "xyes" ; then as_fn_error $? "When using p4est with shared libraries, you need to build deal.II with shared libraries as well." "$LINENO" 5 -- 2.39.5