* allow mpicc to build applications that use internal headers by adding

the right -I flags if we want devel headers

This commit was SVN r6393.

ompi/tools/wrappers/Makefile.am

@@ -26,6 +26,10 @@ AM_CPPFLAGS   = \
       -DOMPI_LIBDIR="\"$(libdir)\"" \
       -DOMPI_FC_MODULE_FLAG="\"$(OMPI_FC_MODULE_FLAG)\""
 
+if WANT_INSTALL_HEADERS
+AM_CPPFLAGS += -DOMPI_WANT_DEVEL_HEADERS=1
+endif
+
 EXTRA_DIST = wrap.cc wrap_engine.cc $(pkgdata_DATA)
 
 pkgdata_DATA = help-wrapper.txt

ompi/tools/wrappers/wrap.cc

@@ -214,7 +214,13 @@ ompi_wrap_build_xppflags(const ompi_sv_t & env_list,
 	xppflags.push_back("-I" + incdir);
     }
 
-#if OMPI_WANT_CXX_BINDINGS
+#if OMPI_WANT_DEVEL_HEADERS
+    xppflags.push_back("-I" + incdir + "/openmpi");
+    xppflags.push_back("-I" + incdir + "/openmpi/opal");
+    xppflags.push_back("-I" + incdir + "/openmpi/orte");
+#endif
+
+#if OMPI_WANT_CXX_BINDINGS || OMPI_WANT_DEVEL_HEADERS
     xppflags.push_back("-I" + incdir + "/openmpi/ompi");
 #endif