]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Ensure we build deal.II with shared libs when using p4est (which is always built...
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 26 Oct 2010 19:31:45 +0000 (19:31 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 26 Oct 2010 19:31:45 +0000 (19:31 +0000)
git-svn-id: https://svn.dealii.org/trunk@22504 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4

index b2be5d61826f1089cb0df90b4cf0faaf8473b767..c2563c0c8b304f9f4714c57137034bd9aed99631 100644 (file)
@@ -340,11 +340,7 @@ AC_DEFUN(DEAL_II_DETERMINE_IF_SUPPORTS_MPI, dnl
          AC_DEFINE(DEAL_II_COMPILER_SUPPORTS_MPI, 1,
                     [Defined if the compiler supports including <mpi.h>])
 
-          dnl Export this variable so that we can refer to it
-         dnl from contrib/configure.in when configuring p4est
          DEAL_II_COMPILER_SUPPORTS_MPI=1
-         export DEAL_II_COMPILER_SUPPORTS_MPI
-
           DEAL_II_USE_MPI=yes
         ],
         [
@@ -7069,6 +7065,13 @@ AC_DEFUN(DEAL_II_CONFIGURE_P4EST, dnl
       AC_MSG_ERROR([p4est directories $use_p4est/DEBUG or $use_p4est/FAST not found])
     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
+      AC_MSG_ERROR([When using p4est with shared libraries, you need to build
+                   deal.II with shared libraries as well.])
+    fi
+
     AC_DEFINE(DEAL_II_USE_P4EST, 1,
               [Defined if we are to use the p4est library to distribute
                meshes on a cluster computer.])

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.