7 files changed, 26 insertions, 16 deletions
diff --git a/lib/make/known-architectures/linux b/lib/make/known-architectures/linux
index f79f9662..29a36188 100644
--- a/lib/make/known-architectures/linux
+++ b/lib/make/known-architectures/linux
@@ -9,12 +9,6 @@
 #   @version   $Header$
 # @@*/
 
-if test -e "/usr/bin/aprun" ; then
- echo "This is probably a Cray XT4 series system."
- echo "Using known-architectures xt4-cray-linux"
- . $srcdir/known-architectures/xt4-cray-linux
-else
-
 
 if test "$CCTK_CONFIG_STAGE" = 'preferred-compilers' ; then
 
@@ -611,5 +605,3 @@ else
 # This is caught by lib/make/extras/MPI/NATIVE then.
 
 fi
-
-fi
diff --git a/lib/make/make.thornlib b/lib/make/make.thornlib
index 2a174598..f6f640ee 100644
--- a/lib/make/make.thornlib
+++ b/lib/make/make.thornlib
@@ -22,17 +22,15 @@ endif
 
 # Include the main make definitions for this configuration
 include $(CONFIG)/make.config.defn
- 
+
 BINDINGS_DIR=$(TOP)/bindings
 
 # Include the configuration make.THORN_NAME.defn for the thorn
-# if it is not Cactus or CactusBindings
+# if it is not CactusBindings
 INC_DIRS = 
 ifneq ($(THORN), CactusBindings)
-ifneq ($(THORN), Cactus)
 -include $(BINDINGS_DIR)/Configuration/Thorns/make.$(THORN).defn
 endif
-endif
 
 # Add appropriate include lines
 INC_DIRS += $(SYS_INC_DIRS) $(SRCDIR) $(SRCDIR)/include $(CONFIG) $(BINDINGS_DIR)/include $(CCTK_HOME)/src/include $(CCTK_HOME)/arrangements $(BINDINGS_DIR)/Configuration/Thorns $(BINDINGS_DIR)/include/$(THORN)
diff --git a/lib/sbin/RunTestUtils.pl b/lib/sbin/RunTestUtils.pl
index 1ec5760a..0fc50920 100644
--- a/lib/sbin/RunTestUtils.pl
+++ b/lib/sbin/RunTestUtils.pl
@@ -512,13 +512,14 @@ sub defprompt
 sub ParseExtras
 {
   my($config_data) = @_;
-  my($mpi,$dir,$sep,$extradir);
+  my($mpi,$dir,$sep,$extradir,$capabilitydir);
 
   $dir = $config_data->{"CCTK_DIR"};
   $sep = $config_data->{"SEPARATOR"};
   $config = $config_data->{"CONFIG"};
 
   $extradir = "$dir${sep}configs${sep}$config${sep}config-data${sep}cctk_Extradefs.h";
+  $capabilitydir = "$dir${sep}configs${sep}$config${sep}bindings${sep}Configuration${sep}Capabilities${sep}cctki_MPI.h";
 
   $mpi = 0;
 
@@ -535,6 +536,19 @@ sub ParseExtras
     close(EXTRA);
   }
 
+  if (-e "$capabilitydir")
+  {
+    open(CAP,"<$capabilitydir");
+    while(<CAP>)
+    {
+      if (/\#define CCTK_MPI/)
+      {
+        $mpi = 1;
+      }
+    }
+    close(CAP);
+  }
+
   return $mpi;
 }
 
diff --git a/src/comm/CactusDefaultComm.c b/src/comm/CactusDefaultComm.c
index b3d341c9..330cdcbe 100644
--- a/src/comm/CactusDefaultComm.c
+++ b/src/comm/CactusDefaultComm.c
@@ -9,6 +9,7 @@
  @@*/
 
 
+#include "cctk_Capabilities.h"
 #include "cctk_Flesh.h"
 #include "cctk_Groups.h"
 #include "cctk_Constants.h"
@@ -29,7 +30,7 @@
 #endif
 
 #ifdef CCTK_MPI
-#include "mpi.h"
+#  include <mpi.h>
 #endif
 
 static const char *rcsid = "$Header$";
diff --git a/src/configuration.ccl b/src/configuration.ccl
index e69de29b..3b95dd47 100644
--- a/src/configuration.ccl
+++ b/src/configuration.ccl
@@ -0,0 +1,3 @@
+OPTIONAL MPI
+{
+}
diff --git a/src/main/ProcessEnvironment.c b/src/main/ProcessEnvironment.c
index 64be6f14..97ec4e2e 100644
--- a/src/main/ProcessEnvironment.c
+++ b/src/main/ProcessEnvironment.c
@@ -11,10 +11,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "cctk_Capabilities.h"
 #include "cctk_Flesh.h"
 
 #ifdef CCTK_MPI
-#include "mpi.h"
+#  include <mpi.h>
 #endif
 
 static const char *rcsid = "$Header$";
diff --git a/src/main/ShutdownCactus.c b/src/main/ShutdownCactus.c
index 1e61224c..df7a347e 100644
--- a/src/main/ShutdownCactus.c
+++ b/src/main/ShutdownCactus.c
@@ -13,13 +13,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "cctk_Capabilities.h"
 #include "cctk_Flesh.h"
 #include "cctk_Misc.h"
 #include "cctk_Parameters.h"
 #include "cctk_Schedule.h"
 
 #ifdef CCTK_MPI
-#include "mpi.h"
+#  include "mpi.h"
 #endif
 
 static const char *rcsid = "$Header$";