commit 2ec7c7c18c0a5d81a12fb8412ac813f681a75f0a
Author: Satish Balay <balay@mcs.anl.gov>
Date:   Mon Feb 6 23:49:42 2017 -0600

    MPI: fix checkMPICHorOpenMPI() to also use mpi.include for CFLAGS
    
    Reported-by: Mohammad S Dodaran <mdodar1@lsu.edu>

diff --git a/config/BuildSystem/config/packages/MPI.py b/config/BuildSystem/config/packages/MPI.py
index 44739a9..d099b85 100644
--- a/config/BuildSystem/config/packages/MPI.py
+++ b/config/BuildSystem/config/packages/MPI.py
@@ -430,6 +430,8 @@ class Configure(config.package.Package):
     import re
     mpich_test = '#include <mpi.h>\nint mpich_ver = MPICH_NUMVERSION;\n'
     openmpi_test = '#include <mpi.h>\nint ompi_major = OMPI_MAJOR_VERSION;\nint ompi_minor = OMPI_MINOR_VERSION;\nint ompi_release = OMPI_RELEASE_VERSION;\n'
+    oldFlags = self.compilers.CPPFLAGS
+    self.compilers.CPPFLAGS += ' '+self.headers.toString(self.include)
     if self.checkCompile(mpich_test):
       buf = self.outputPreprocess(mpich_test)
       try:
@@ -449,6 +451,8 @@ class Configure(config.package.Package):
         self.addDefine('HAVE_OMPI_RELEASE_VERSION',ompi_release_version)
       except:
         self.logPrint('Unable to parse OpenMPI version from header. Probably a buggy preprocessor')
+    self.compilers.CPPFLAGS = oldFlags
+    return
   def findMPIInc(self):
     '''Find MPI include paths from "mpicc -show"'''
     import re