]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Only allow using p4est if we also have MPI.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 12 Oct 2011 02:36:38 +0000 (02:36 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 12 Oct 2011 02:36:38 +0000 (02:36 +0000)
git-svn-id: https://svn.dealii.org/trunk@24594 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/configure

index 998e7466643e6d01a864236f95b06d9c84a5057d..93f8377885c8130607d51645a714112c5aaaa344 100644 (file)
@@ -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
index 9f0af88102eae9d91fab4ced2cec8a3fe7288176..622892f8cb691285872643970aa8d4c0425d7967 100755 (executable)
@@ -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.
 #
     { $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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.