HAVE_MPI used different.

[[Imported from SVN: r945]]

grid/albertgrid/agcommunicator.hh

@@ -5,15 +5,13 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+#if !HAVE_MPI
+#undef ALBERT_USES_MPI
+#else
+#include <mpi.h>
 #endif
-
-#ifndef MPI_ACTIVE
-#undef HAVE_MPI
 #endif
 
-#ifdef HAVE_MPI
-#include <mpi.h>
-#endif
 
 #include <dune/common/dlist.hh>
 
@@ -27,7 +25,7 @@ namespace Dune {
      these two procs.
    */
 
-#ifdef HAVE_MPI
+#ifdef ALBERT_USES_MPI
   template <class BufferType>
   class ProcListElement
   {
@@ -182,24 +180,24 @@ namespace Dune {
   template <class T>
   class GathScatt
   {
-    T fuck;
+    T fake;
   public:
 
     template <class VecType>
     void gather (VecType & t, int index )
     {
-      fuck = t[index];
+      fake = t[index];
     }
 
     template <class VecType>
     void scatter(VecType & t , int index)
     {
-      t[index] = fuck;
+      t[index] = fake;
     }
 
   };
 
-#ifdef HAVE_MPI
+#ifdef ALBERT_USES_MPI
   template <class GridType, class IndexSetType>
   class AlbertGridCommunicator
   {