Only error out when multiple modules declaring mp_bits are found _and_

the values they declare are unequal.

2 files changed, 6 insertions, 4 deletions

diff --git a/configure.pl b/configure.pl
index 18311fc2e..7d2ed2156 100755
--- a/configure.pl
+++ b/configure.pl
@@ -1204,13 +1204,14 @@ sub find_mp_bits
     my(@modules_list) = @_;
     my $mp_bits = 32; # default, good for most systems
     my $seen_mp_module = 0;
+
     foreach my $modname (@modules_list)
     {
         my %modinfo = %{ $MODULES{$modname} };
         if($modinfo{'mp_bits'})
         {
-            die "(error): More than one MPI module was loaded\n"
-                if($seen_mp_module);
+            die "(error): Inconsistent mp_bits requests from modules\n"
+                if($seen_mp_module && $modinfo{'mp_bits'} != $mp_bits);
 
             $seen_mp_module = 1;
             $mp_bits = $modinfo{'mp_bits'};
diff --git a/misc/config/code/misc.pl b/misc/config/code/misc.pl
index 0d95564b7..63fc4cccf 100644
--- a/misc/config/code/misc.pl
+++ b/misc/config/code/misc.pl
@@ -165,13 +165,14 @@ sub find_mp_bits
     my(@modules_list) = @_;
     my $mp_bits = 32; # default, good for most systems
     my $seen_mp_module = 0;
+
     foreach my $modname (@modules_list)
     {
         my %modinfo = %{ $MODULES{$modname} };
         if($modinfo{'mp_bits'})
         {
-            die "(error): More than one MPI module was loaded\n"
-                if($seen_mp_module);
+            die "(error): Inconsistent mp_bits requests from modules\n"
+                if($seen_mp_module && $modinfo{'mp_bits'} != $mp_bits);
 
             $seen_mp_module = 1;
             $mp_bits = $modinfo{'mp_bits'};