From 703edbb0e62c8e34e021440813b737f1f0763a93 Mon Sep 17 00:00:00 2001
From: Brian Barrett <brbarret@open-mpi.org>
Date: Mon, 7 Jan 2013 18:57:03 +0000
Subject: [PATCH] Don't push infiniband CPPFLAGS into CPPFLAGS, but into the
 component CPPFLAGS

This commit was SVN r27754.
---
 config/ompi_check_openfabrics.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/ompi_check_openfabrics.m4 b/config/ompi_check_openfabrics.m4
index dcdca10b07..418a8cca27 100644
--- a/config/ompi_check_openfabrics.m4
+++ b/config/ompi_check_openfabrics.m4
@@ -241,8 +241,9 @@ AC_DEFUN([OMPI_CHECK_OPENFABRICS],[
     AS_IF([test -z "$opal_verbs_dir"],
           [openib_include_dir="/usr/include"],
           [openib_include_dir="$opal_verbs_dir/include"])
+    $1_CPPFLAGS="$$1_CPPFLAGS -I$openib_include_dir/infiniband"
 
-    CPPFLAGS="$ompi_check_openib_$1_save_CPPFLAGS -I$openib_include_dir/infiniband"
+    CPPFLAGS="$ompi_check_openib_$1_save_CPPFLAGS"
     LDFLAGS="$ompi_check_openib_$1_save_LDFLAGS"
     LIBS="$ompi_check_openib_$1_save_LIBS"