Always make sure to create $(includedir)/openmpi, even if we were

configured with --disable-mpi-cxx so that the default -I flags in the
wrapper compilers don't point to a directory that doesn't exist.
Thanks to Martin Audet for identifying the problem.

This commit was SVN r13296.

NEWS

@@ -41,6 +41,10 @@ Trunk (not on release branches yet)
 1.2
 ---
 
+- Always ensure to create $(includedir)/openmpi, even if the C++
+  bindings are disabled so that the wrapper compilers don't point to
+  a directory that doesn't exist.  Thanks to Martin Audet for
+  identifying the problem.
 - Fixes for endian handling in MPI process startup.
 - Openib BTL initialization fixes for cases where MPI processes in the
   same job has different numbers of active ports on the same physical

ompi/mpi/cxx/Makefile.am

@@ -10,6 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -69,5 +70,9 @@ ompidir = $(includedir)/openmpi/ompi/mpi/cxx
 ompi_HEADERS = \
         $(headers)
 else
-ompidir = $(includedir)
+# If the C++ bindings were disabled, still ensure that this directory
+# is created so that the default -I flags in the wrapper compilers
+# point to a directory that exists.
+ompidir = $(includedir)/openmpi
+ompi_DATA = README.txt
 endif

ompi/mpi/cxx/README.txt

@@ -0,0 +1,4 @@
+This file is here solely as a placeholder so that Open MPI's
+Automake-based installer creates the installation directory
+$(installdir)/openmpi (you must have disabled the MPI C++ bindings,
+because they would normally create this directory automatically).