MCA: Add the project/project version to the MCA base component

This commit adds support for project_framework_component_* parameter
matching. This is the first step in allowing the same framework name
in multiple projects. This change also bumps the MCA component version
to 2.1.0.

All master frameworks have been updated to use the new component
versioning macro. An mca.h has been added to each project to add a
project specific versioning macro of the form
PROJECT_MCA_VERSION_2_1_0.

Signed-off-by: Nathan Hjelm <hjelmn@me.com>

ompi/Makefile.am

@@ -12,7 +12,7 @@
 # Copyright (c) 2008-2014 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # Copyright (c) 2010-2011 Sandia National Laboratories. All rights reserved.
-# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
+# Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights
 #                         reserved.
 # $COPYRIGHT$
 # 
@@ -189,6 +189,7 @@ include mpi/man/man3/Makefile.extra
 include mpiext/Makefile.am
 include patterns/net/Makefile.am
 include patterns/comm/Makefile.am
+include mca/Makefile.am
 
 # Ensure that the man page directory exists before we try to make man
 # page files (because ompi/mpi/man/man3 has no config.status-generated

ompi/mca/Makefile.am

@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from opal/Makefile.am
+
+# Source code files
+headers += \
+	mca/mca.h

ompi/mca/bcol/base/base.h

@@ -14,7 +14,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/class/opal_list.h"
 #include "ompi/mca/bcol/bcol.h"
 

ompi/mca/bcol/base/bcol_base_frame.c

@@ -22,7 +22,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif  /* HAVE_UNIST_H */
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/util/argv.h"
 

ompi/mca/bcol/base/bcol_base_init.c

@@ -13,7 +13,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/bcol/bcol.h"
 #include "ompi/mca/bcol/base/base.h"

ompi/mca/bcol/basesmuma/bcol_basesmuma.h

@@ -26,7 +26,7 @@
 #include "ompi/proc/proc.h"
 #include "ompi/patterns/net/netpatterns.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/util/arch.h"
 #include "opal/util/argv.h"
 #include "opal/datatype/opal_datatype.h"

ompi/mca/bcol/bcol.h

@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 #include "opal/class/opal_list.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/coll/coll.h"
 #include "opal/mca/mpool/mpool.h"
 #include "ompi/mca/sbgp/sbgp.h"
@@ -186,8 +186,7 @@ typedef int (*mca_bcol_barrier_init_fn_t)(struct mca_bcol_base_module_t *bcol_mo
  * Macro for use in modules that are of type btl v2.0.0
  */
 #define MCA_BCOL_BASE_VERSION_2_0_0 \
-    MCA_BASE_VERSION_2_0_0, \
-      "bcol", 2, 0, 0
+    OMPI_MCA_BASE_VERSION_2_1_0("bcol", 2, 0, 0)
 
 
 /* This is really an abstarction violation, but is the easiest way to get

ompi/mca/bcol/iboffload/bcol_iboffload.h

@@ -22,7 +22,7 @@
 #include <infiniband/verbs.h>
 #include <infiniband/mverbs.h>
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 
 #include "ompi/op/op.h"
 #include "ompi/datatype/ompi_datatype.h"

ompi/mca/bcol/ptpcoll/bcol_ptpcoll.h

@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/bcol/bcol.h"
 #include "ompi/mca/bcol/base/base.h"
 #include "opal/mca/mpool/mpool.h"

ompi/mca/bml/base/base.h

@@ -22,7 +22,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/mca_base_framework.h"
 #include "ompi/mca/bml/bml.h"
 

ompi/mca/bml/base/bml_base_btl.h

@@ -21,7 +21,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 
 
 /*

ompi/mca/bml/base/bml_base_init.c

@@ -20,7 +20,7 @@
 #include "ompi/mca/bml/base/base.h" 
 #include "opal/mca/base/base.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/runtime/opal.h"
 
 mca_bml_base_module_t mca_bml = {

ompi/mca/bml/bml.h

@@ -11,7 +11,7 @@
  * Copyright (c) 2004-2006 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2012-2014 Los Alamos National Security, LLC.  All rights
+ * Copyright (c) 2012-2015 Los Alamos National Security, LLC.  All rights
  *                         reserved. 
  * $COPYRIGHT$
  * 
@@ -30,7 +30,7 @@
 #define MCA_BML_H
 
 #include "ompi_config.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/datatype/opal_convertor.h"
 #include "opal/mca/crs/crs.h"
 #include "opal/mca/crs/base/base.h"
@@ -577,7 +577,6 @@ typedef struct mca_bml_base_module_t mca_bml_base_module_t;
  * Macro for use in modules that are of type bml
  */
 #define MCA_BML_BASE_VERSION_2_0_0 \
-  MCA_BASE_VERSION_2_0_0, \
-  "bml", 2, 0, 0
+    OMPI_MCA_BASE_VERSION_2_1_0("bml", 2, 0, 0)
 
 #endif /* OMPI_MCA_BML_H */

ompi/mca/bml/r2/bml_r2.h

@@ -23,7 +23,7 @@
  */
 
 #include "ompi_config.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/btl/btl.h"
 
 #ifndef MCA_BML_R2_H

ompi/mca/coll/base/coll_base_comm_select.c

@@ -38,7 +38,7 @@
 #include "opal/util/show_help.h"
 #include "opal/class/opal_list.h"
 #include "opal/class/opal_object.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"

ompi/mca/coll/base/coll_base_comm_unselect.c

@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 #include "ompi/communicator/communicator.h"

ompi/mca/coll/base/coll_base_find_available.c

@@ -32,7 +32,7 @@
 #include "ompi/constants.h"
 #include "opal/class/opal_list.h"
 #include "opal/util/output.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/base/mca_base_component_repository.h"
 

ompi/mca/coll/base/coll_base_frame.c

@@ -26,7 +26,7 @@
 #include <stdio.h>
 
 #include "ompi/constants.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/util/output.h"
 #include "opal/mca/base/base.h"
 

ompi/mca/coll/base/coll_base_functions.h

@@ -29,7 +29,7 @@
 #include "ompi_config.h"
 
 #include "ompi/mca/coll/base/base.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/request/request.h"
 

ompi/mca/coll/base/coll_base_util.h

@@ -24,7 +24,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/request/request.h"
 #include "ompi/mca/pml/pml.h"

ompi/mca/coll/basic/coll_basic.h

@@ -27,7 +27,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/request/request.h"
 #include "ompi/communicator/communicator.h"

ompi/mca/coll/coll.h

@@ -13,7 +13,7 @@
  * Copyright (c) 2007-2008 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2007-2008 UT-Battelle, LLC
  * Copyright (c) 2012      Oak Rigde National Laboratory. All rights reserved.
- * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
+ * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * Copyright (c) 2014      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
@@ -64,7 +64,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 #include "opal/mca/crs/crs.h"
@@ -595,8 +595,7 @@ typedef struct mca_coll_base_comm_coll_t mca_coll_base_comm_coll_t;
  * Macro for use in components that are of type coll
  */
 #define MCA_COLL_BASE_VERSION_2_0_0 \
-  MCA_BASE_VERSION_2_0_0, \
-  "coll", 2, 0, 0
+    OMPI_MCA_BASE_VERSION_2_1_0("coll", 2, 0, 0)
 
 
 /* ******************************************************************** */

ompi/mca/coll/cuda/coll_cuda.h

@@ -18,7 +18,7 @@
 #include "mpi.h"
 
 #include "opal/class/opal_object.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 
 #include "ompi/constants.h"
 #include "ompi/mca/coll/coll.h"

ompi/mca/coll/demo/coll_demo.h

@@ -23,7 +23,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/coll/coll.h"
 
 BEGIN_C_DECLS

ompi/mca/coll/fca/coll_fca.h

@@ -15,7 +15,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/request/request.h"
 #include "ompi/mca/pml/pml.h"

ompi/mca/coll/hcoll/coll_hcoll.h

@@ -13,7 +13,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/memoryhooks/memory.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/request/request.h"

ompi/mca/coll/inter/coll_inter.h

@@ -25,7 +25,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/communicator/communicator.h"
 

ompi/mca/coll/ml/coll_ml.h

@@ -19,7 +19,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/datatype/opal_convertor.h"
 #include "opal/threads/mutex.h"

ompi/mca/coll/ml/coll_ml_custom_utils.c

@@ -26,7 +26,7 @@
 #include "opal/util/output.h"
 #include "opal/class/opal_list.h"
 #include "opal/class/opal_object.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/threads/mutex.h"
 #include "opal/sys/atomic.h"

ompi/mca/coll/portals4/coll_portals4.h

@@ -18,7 +18,7 @@
 #include <portals4.h>
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/request/request.h"
 #include "ompi/communicator/communicator.h"

ompi/mca/coll/self/coll_self.h

@@ -23,7 +23,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/request/request.h"
 

ompi/mca/coll/sm/coll_sm.h

@@ -24,7 +24,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/datatype/opal_convertor.h"
 #include "opal/mca/common/sm/common_sm.h"
 #include "ompi/mca/coll/coll.h"

ompi/mca/coll/tuned/coll_tuned.h

@@ -16,7 +16,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/request/request.h"
 #include "ompi/mca/coll/base/coll_base_functions.h"
 

ompi/mca/coll/tuned/coll_tuned_dynamic_file.c

@@ -23,7 +23,7 @@
 #include <stdio.h>
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "coll_tuned.h"
 
 /* need to include our own topo prototypes so we can malloc data on the comm correctly */

ompi/mca/coll/tuned/coll_tuned_dynamic_rules.c

@@ -20,7 +20,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/constants.h"
 #include "coll_tuned.h"
 

ompi/mca/crcp/base/crcp_base_fns.c

@@ -29,7 +29,7 @@
 #include <ctype.h>
 
 #include "opal/class/opal_bitmap.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/crs/crs.h"

ompi/mca/crcp/base/crcp_base_frame.c

@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/util/output.h"
 #include "opal/mca/base/base.h"
 

ompi/mca/crcp/base/crcp_base_select.c

@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/util/output.h"
 #include "opal/mca/base/base.h"
 

ompi/mca/crcp/bkmrk/crcp_bkmrk.h

@@ -26,7 +26,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/crcp/crcp.h"
 #include MCA_timer_IMPLEMENTATION_HEADER
 

ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.c

@@ -24,7 +24,7 @@
 #include "opal/class/opal_bitmap.h"
 #include "opal/mca/event/event.h"
 #include "opal/util/opal_environ.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/btl/btl.h"
 #include "opal/mca/btl/base/base.h"

ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.h

@@ -26,7 +26,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 
 #include "ompi/mca/crcp/crcp.h"
 #include "ompi/mca/crcp/bkmrk/crcp_bkmrk.h"

ompi/mca/crcp/bkmrk/crcp_bkmrk_module.c

@@ -21,7 +21,7 @@
 #include <unistd.h>
 #endif  /* HAVE_UNIST_H */
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 #include "opal/util/output.h"

ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c

@@ -31,7 +31,7 @@
 #include "opal/util/output.h"
 
 #include "opal/util/opal_environ.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/pmix/pmix.h"
 

ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.h

@@ -27,7 +27,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/crcp/crcp.h"
 #include "ompi/communicator/communicator.h"
 

ompi/mca/crcp/crcp.h

@@ -31,7 +31,7 @@
 #include "ompi_config.h"
 
 #include "opal/class/opal_object.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/crs/crs.h"
 #include "opal/mca/crs/base/base.h"
@@ -364,8 +364,7 @@ OMPI_DECLSPEC extern ompi_crcp_base_module_t ompi_crcp;
  * Macro for use in components that are of type CRCP
  */
 #define OMPI_CRCP_BASE_VERSION_2_0_0 \
-    MCA_BASE_VERSION_2_0_0, \
-    "crcp", 2, 0, 0
+    OMPI_MCA_BASE_VERSION_2_1_0("crcp", 2, 0, 0)
 
 /**
  * Macro to call the CRCP Request Complete function

ompi/mca/dpm/base/dpm_base_frame.c

@@ -20,7 +20,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/util/output.h"
 #include "opal/mca/base/base.h"
 

ompi/mca/dpm/base/dpm_base_select.c

@@ -18,7 +18,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 #include "opal/mca/base/mca_base_component_repository.h"

ompi/mca/dpm/dpm.h

@@ -11,7 +11,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2013      Intel, Inc. All rights reserved
- * Copyright (c) 2013      Los Alamos National Security, LLC.  All rights
+ * Copyright (c) 2013-2015 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * $COPYRIGHT$
  * 
@@ -38,7 +38,7 @@
 #include <sys/time.h>
 #endif
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 #include "ompi/info/info.h"
@@ -227,8 +227,7 @@ typedef struct ompi_dpm_base_component_2_0_0_t ompi_dpm_base_component_t;
  * Macro for use in components that are of type DPM
  */
 #define OMPI_DPM_BASE_VERSION_2_0_0 \
-    MCA_BASE_VERSION_2_0_0, \
-    "dpm", 2, 0, 0
+    OMPI_MCA_BASE_VERSION_2_1_0("dpm", 2, 0, 0)
 
 
 END_C_DECLS

ompi/mca/fbtl/base/fbtl_base_file_select.c

@@ -23,7 +23,7 @@
 
 #include "opal/class/opal_list.h"
 #include "opal/util/argv.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/fbtl/fbtl.h"
 #include "ompi/mca/fbtl/base/base.h"

ompi/mca/fbtl/base/fbtl_base_file_unselect.c

@@ -26,7 +26,7 @@
 #include "mpi.h"
 #include "ompi/mca/io/ompio/io_ompio.h"
 #include "opal/util/show_help.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/fbtl/fbtl.h"
 #include "ompi/mca/fbtl/base/base.h"

ompi/mca/fbtl/base/fbtl_base_find_available.c

@@ -25,7 +25,7 @@
 #include "mpi.h"
 #include "ompi/constants.h"
 #include "opal/class/opal_list.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/fbtl/fbtl.h"
 #include "ompi/mca/fbtl/base/base.h"

ompi/mca/fbtl/base/fbtl_base_frame.c

@@ -24,7 +24,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 #include "ompi/mca/fbtl/fbtl.h"

ompi/mca/fbtl/fbtl.h

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -10,6 +11,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2008-2014 University of Houston. All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -22,7 +25,7 @@
 
 #include "ompi_config.h"
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/request/request.h"
 #ifdef HAVE_SYS_UIO_H
@@ -38,8 +41,7 @@ struct mca_ompio_request_t;
  * Macro for use in components that are of type coll
  */
 #define MCA_FBTL_BASE_VERSION_2_0_0 \
-    MCA_BASE_VERSION_2_0_0, \
-        "fbtl", 2, 0, 0
+    OMPI_MCA_BASE_VERSION_2_1_0("fbtl", 2, 0, 0)
 
 /*
  * The file byte transfer layer (fbtl) framework provides the abstraction

ompi/mca/fbtl/plfs/fbtl_plfs.h

@@ -21,7 +21,7 @@
 #define MCA_FBTL_PLFS_H
 
 #include "ompi_config.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/fbtl/fbtl.h"
 #include "ompi/mca/io/ompio/io_ompio.h"
 #include <plfs.h>

ompi/mca/fbtl/posix/fbtl_posix.h

@@ -21,7 +21,7 @@
 #define MCA_FBTL_POSIX_H
 
 #include "ompi_config.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/fbtl/fbtl.h"
 #include "ompi/mca/io/ompio/io_ompio.h"
 #include "ompi/mca/io/ompio/io_ompio_request.h"

ompi/mca/fbtl/pvfs2/fbtl_pvfs2.h

@@ -21,7 +21,7 @@
 #define MCA_FBTL_PVFS2_H
 
 #include "ompi_config.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/fbtl/fbtl.h"
 #include "ompi/mca/io/ompio/io_ompio.h"
 #include "ompi/mca/fs/pvfs2/fs_pvfs2.h"

ompi/mca/fcoll/base/fcoll_base_file_select.c

@@ -23,7 +23,7 @@
 
 #include "opal/class/opal_list.h"
 #include "opal/util/argv.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/fcoll/fcoll.h"
 #include "ompi/mca/fcoll/base/base.h"

ompi/mca/fcoll/base/fcoll_base_file_unselect.c

@@ -26,7 +26,7 @@
 #include "mpi.h"
 #include "ompi/mca/io/ompio/io_ompio.h"
 #include "opal/util/show_help.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/fcoll/fcoll.h"
 #include "ompi/mca/fcoll/base/base.h"

ompi/mca/fcoll/base/fcoll_base_frame.c

@@ -24,7 +24,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 #include "ompi/mca/fcoll/fcoll.h"

ompi/mca/fcoll/dynamic/fcoll_dynamic.h

@@ -23,7 +23,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/fcoll/fcoll.h"
 #include "ompi/mca/fcoll/base/base.h"
 #include "ompi/mca/io/ompio/io_ompio.h"

ompi/mca/fcoll/fcoll.h

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -10,6 +11,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2008-2011 University of Houston. All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -22,7 +25,7 @@
 
 #include "ompi_config.h"
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 BEGIN_C_DECLS
@@ -33,8 +36,7 @@ struct mca_io_ompio_file_t;
  * Macro for use in components that are of type coll
  */
 #define MCA_FCOLL_BASE_VERSION_2_0_0 \
-    MCA_BASE_VERSION_2_0_0, \
-        "fcoll", 2, 0, 0
+    OMPI_MCA_BASE_VERSION_2_1_0("fcoll", 2, 0, 0)
 
 /*
  * This framework provides the abstraction for the collective file

ompi/mca/fcoll/individual/fcoll_individual.h

@@ -23,7 +23,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/fcoll/fcoll.h"
 #include "ompi/mca/fcoll/base/base.h"
 #include "ompi/mca/io/ompio/io_ompio.h"

ompi/mca/fcoll/static/fcoll_static.h

@@ -23,7 +23,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/fcoll/fcoll.h"
 #include "ompi/mca/fcoll/base/base.h"
 #include "ompi/mca/io/ompio/io_ompio.h"

ompi/mca/fcoll/two_phase/fcoll_two_phase.h

@@ -23,7 +23,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/fcoll/fcoll.h"
 #include "ompi/mca/fcoll/base/base.h"
 #include "ompi/mca/io/ompio/io_ompio.h"

ompi/mca/fs/base/fs_base_file_select.c

@@ -23,7 +23,7 @@
 
 #include "opal/class/opal_list.h"
 #include "opal/util/argv.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/fs/fs.h"
 #include "ompi/mca/fs/base/base.h"

ompi/mca/fs/base/fs_base_file_unselect.c

@@ -26,7 +26,7 @@
 #include "mpi.h"
 #include "ompi/mca/io/ompio/io_ompio.h"
 #include "opal/util/show_help.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/fs/fs.h"
 #include "ompi/mca/fs/base/base.h"

ompi/mca/fs/base/fs_base_find_available.c

@@ -24,7 +24,7 @@
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/fs/fs.h"
 #include "ompi/mca/fs/base/base.h"

ompi/mca/fs/base/fs_base_get_parent_dir.c

@@ -23,7 +23,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 #include "ompi/mca/fs/fs.h"

ompi/mca/fs/fs.h

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -10,6 +11,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2008-2015 University of Houston. All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -22,7 +25,7 @@
 
 #include "ompi_config.h"
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 BEGIN_C_DECLS
@@ -33,8 +36,7 @@ struct mca_io_ompio_file_t;
  * Macro for use in components that are of type coll
  */
 #define MCA_FS_BASE_VERSION_2_0_0 \
-    MCA_BASE_VERSION_2_0_0, \
-        "fs", 2, 0, 0
+    OMPI_MCA_BASE_VERSION_2_1_0("fs", 2, 0, 0)
 
 /*
  * This framework provides the abstraction for file management operations

ompi/mca/fs/lustre/fs_lustre.h

@@ -21,7 +21,7 @@
 #define MCA_FS_LUSTRE_H
 
 #include "ompi_config.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/fs/fs.h"
 #include "ompi/mca/io/ompio/io_ompio.h"
 

ompi/mca/fs/plfs/fs_plfs.h

@@ -21,7 +21,7 @@
 #define MCA_FS_PLFS_H
 
 #include "ompi_config.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/fs/fs.h"
 #include "ompi/mca/io/ompio/io_ompio.h"
 

ompi/mca/fs/pvfs2/fs_pvfs2.h

@@ -32,7 +32,7 @@
 #include "pvfs2-compat.h"
 
 #include "ompi_config.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/fs/fs.h"
 #include "ompi/mca/io/ompio/io_ompio.h"
 

ompi/mca/fs/ufs/fs_ufs.h

@@ -21,7 +21,7 @@
 #define MCA_FS_UFS_H
 
 #include "ompi_config.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/fs/fs.h"
 #include "ompi/mca/io/ompio/io_ompio.h"
 

ompi/mca/io/base/io_base_delete.c

@@ -27,7 +27,7 @@
 #include "opal/class/opal_list.h"
 #include "opal/util/argv.h"
 #include "opal/util/output.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/io/base/base.h"

ompi/mca/io/base/io_base_file_select.c

@@ -30,7 +30,7 @@
 #include "opal/util/output.h"
 #include "opal/class/opal_list.h"
 #include "opal/class/opal_object.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/io/base/base.h"

ompi/mca/io/base/io_base_find_available.c

@@ -25,7 +25,7 @@
 #include "mpi.h"
 #include "ompi/constants.h"
 #include "opal/util/output.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/io/base/base.h"

ompi/mca/io/io.h

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -10,6 +11,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -21,7 +24,7 @@
 #define MCA_IO_H
 
 #include "mpi.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/request/request.h"
 
 /*
@@ -66,8 +69,7 @@ typedef enum mca_io_base_version_t mca_io_base_version_t;
  * 1-1 mapping of all MPI-IO functions
  */
 #define MCA_IO_BASE_VERSION_2_0_0 \
-  MCA_BASE_VERSION_2_0_0, \
-  "io", 2, 0, 0
+    OMPI_MCA_BASE_VERSION_2_1_0("io", 2, 0, 0)
 
 /*
  * Component

ompi/mca/mca.h

@@ -0,0 +1,39 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * $COPYRIGHT$
+ * 
+ * Additional copyrights may follow
+ * 
+ * $HEADER$
+ */
+/** 
+ * @file 
+ *
+ * Top-level interface for \em all orte MCA components.
+ */
+
+#ifndef OMPI_MCA_H
+#define OMPI_MCA_H
+
+#include "ompi_config.h"
+#include "opal/mca/mca.h"
+
+#define OMPI_MCA_BASE_VERSION_2_1_0(type, type_major, type_minor, type_release) \
+    MCA_BASE_VERSION_2_1_0("ompi", OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION,      \
+                           OMPI_RELEASE_VERSION, type, type_major, type_minor,  \
+                           type_release)
+
+#endif /* OMPI_MCA_H */

ompi/mca/mtl/base/base.h

@@ -21,7 +21,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/mtl/mtl.h"
 
 

ompi/mca/mtl/base/mtl_base_datatype.h

@@ -18,7 +18,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/mtl/mtl.h"
 #include "ompi/mca/mtl/base/base.h"
 #include "ompi/constants.h"

ompi/mca/mtl/base/mtl_base_frame.c

@@ -20,7 +20,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/util/output.h"
 #include "opal/mca/base/base.h"
 

ompi/mca/mtl/mtl.h

@@ -1,7 +1,10 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2006 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2012      Sandia National Laboratories.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -35,7 +38,7 @@
 
 #include "ompi_config.h"
 #include "mpi.h" /* needed for MPI_ANY_TAG */
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "ompi/mca/pml/pml.h" /* for send_mode enum */
 #include "ompi/request/request.h"
 
@@ -420,8 +423,7 @@ typedef struct mca_mtl_base_module_t mca_mtl_base_module_t;
  * Macro for use in modules that are of type mtl
  */
 #define MCA_MTL_BASE_VERSION_2_0_0 \
-  MCA_BASE_VERSION_2_0_0, \
-  "mtl", 2, 0, 0
+    OMPI_MCA_BASE_VERSION_2_1_0("mtl", 2, 0, 0)
 
 /*
  * macro for doing direct call / call through struct

ompi/mca/op/base/op_base_find_available.c

@@ -27,7 +27,7 @@
 
 #include "opal/class/opal_list.h"
 #include "opal/util/output.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/base/mca_base_component_repository.h"
 

ompi/mca/op/base/op_base_frame.c

@@ -25,7 +25,7 @@
 #endif
 
 #include "opal/util/output.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 #include "ompi/constants.h"

ompi/mca/op/base/op_base_op_select.c

@@ -33,7 +33,7 @@
 #include "opal/util/output.h"
 #include "opal/class/opal_list.h"
 #include "opal/class/opal_object.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 

ompi/mca/op/example/op_example.h

@@ -22,7 +22,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/class/opal_object.h"
 
 #include "ompi/mca/op/op.h"

ompi/mca/op/op.h

@@ -14,7 +14,7 @@
  *                         reserved. 
  * Copyright (c) 2007-2008 UT-Battelle, LLC
  * Copyright (c) 2007-2009 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
+ * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
  * 
@@ -84,7 +84,7 @@
 #include "ompi_config.h"
 
 #include "opal/class/opal_object.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 
 /*
  * This file includes some basic struct declarations (but not
@@ -410,8 +410,7 @@ typedef ompi_op_base_op_3buff_fns_1_0_0_t ompi_op_base_op_3buff_fns_t;
  * Macro for use in modules that are of type op v2.0.0
  */
 #define OMPI_OP_BASE_VERSION_1_0_0 \
-    MCA_BASE_VERSION_2_0_0, \
-    "op", 1, 0, 0
+    OMPI_MCA_BASE_VERSION_2_1_0("op", 1, 0, 0)
 
 END_C_DECLS
 

ompi/mca/op/x86/op_x86.h

@@ -22,7 +22,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/class/opal_object.h"
 
 #include "ompi/mca/op/op.h"

ompi/mca/osc/base/osc_base_frame.c

@@ -19,7 +19,7 @@
 #include "ompi_config.h"
 #include "ompi/constants.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/util/output.h"
 #include "opal/mca/base/base.h"
 

ompi/mca/osc/base/osc_base_init.c

@@ -20,7 +20,7 @@
 #include "ompi_config.h"
 
 #include "ompi/constants.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/osc/osc.h"
 #include "ompi/mca/osc/base/base.h"

ompi/mca/osc/osc.h

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2005 The Trustees of Indiana University.
  *                         All rights reserved.
@@ -7,7 +8,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+ * Copyright (c) 2007-2015 Los Alamos National Security, LLC.  All rights
  *                         reserved. 
  * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
@@ -35,7 +36,7 @@
 #include <stddef.h>
 #endif
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 
 BEGIN_C_DECLS
 
@@ -418,8 +419,7 @@ typedef ompi_osc_base_module_3_0_0_t ompi_osc_base_module_t;
 
 /** Macro for use in components that are of type osc */
 #define OMPI_OSC_BASE_VERSION_3_0_0 \
-  MCA_BASE_VERSION_2_0_0, \
-  "osc", 3, 0, 0
+    OMPI_MCA_BASE_VERSION_2_1_0("osc", 3, 0, 0)
 
 
 /* ******************************************************************** */

ompi/mca/pml/base/base.h

@@ -23,7 +23,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/mca_base_framework.h"
 #include "opal/class/opal_list.h"
 #include "opal/class/opal_pointer_array.h"

ompi/mca/pml/base/pml_base_frame.c

@@ -30,7 +30,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif  /* HAVE_UNIST_H */
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/util/output.h"
 #include "opal/mca/base/base.h"
 

ompi/mca/pml/base/pml_base_select.c

@@ -31,7 +31,7 @@
 #include "opal/util/output.h"
 #include "opal/util/show_help.h"
 #include "opal/runtime/opal_progress.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"
 #include "opal/mca/pmix/pmix.h"
@@ -301,13 +301,11 @@ int mca_pml_base_select(bool enable_progress_threads,
 /* need a "commonly" named PML structure so everything ends up in the
    same modex field */
 static mca_base_component_t pml_base_component = {
-    MCA_BASE_VERSION_2_0_0,
-    "pml",
-    MCA_BASE_VERSION_2_0_0,
-    "base",
-    MCA_BASE_VERSION_2_0_0,
-    NULL,
-    NULL
+    OMPI_MCA_BASE_VERSION_2_1_0("pml", 2, 0, 0),
+    .mca_component_name = "base",
+    .mca_component_major_version = 2,
+    .mca_component_minor_version = 0,
+    .mca_component_release_version = 0,
 };
 
 

ompi/mca/pml/pml.h

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -9,7 +10,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2006 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
+ * Copyright (c) 2006-2015 Los Alamos National Security, LLC.  All rights
  *                         reserved. 
  * Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
  * $COPYRIGHT$
@@ -63,7 +64,7 @@
 #define MCA_PML_H
 
 #include "ompi_config.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "mpi.h" /* needed for MPI_ANY_TAG */
 
 BEGIN_C_DECLS
@@ -537,8 +538,7 @@ typedef mca_pml_base_module_1_0_0_t mca_pml_base_module_t;
  * Macro for use in components that are of type pml
  */
 #define MCA_PML_BASE_VERSION_2_0_0 \
-  MCA_BASE_VERSION_2_0_0, \
-  "pml", 2, 0, 0
+    OMPI_MCA_BASE_VERSION_2_1_0("pml", 2, 0, 0)
 
     /*
      * macro for doing direct call / call through struct

ompi/mca/pubsub/base/pubsub_base_frame.c

@@ -18,7 +18,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/util/output.h"
 #include "opal/mca/base/base.h"
 

ompi/mca/pubsub/base/pubsub_base_select.c

@@ -18,7 +18,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 #include "opal/mca/base/mca_base_component_repository.h"

ompi/mca/pubsub/pubsub.h

@@ -10,7 +10,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2013      Los Alamos National Security, LLC.  All rights
+ * Copyright (c) 2013-2015 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * $COPYRIGHT$
  * 
@@ -30,7 +30,7 @@
 
 #include "ompi_config.h"
 
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 
@@ -100,8 +100,7 @@ typedef struct ompi_pubsub_base_component_2_0_0_t ompi_pubsub_base_component_t;
  * Macro for use in components that are of type PUBSUB
  */
 #define OMPI_PUBSUB_BASE_VERSION_2_0_0 \
-    MCA_BASE_VERSION_2_0_0, \
-    "pubsub", 2, 0, 0
+    OMPI_MCA_BASE_VERSION_2_1_0("pubsub", 2, 0, 0)
 
 
 END_C_DECLS

ompi/mca/rte/base/rte_base_frame.c

@@ -15,7 +15,7 @@
 
 #include "opal_stdint.h"
 #include "opal/util/output.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 #include "ompi/mca/rte/rte.h"

ompi/mca/rte/rte.h

@@ -1,5 +1,6 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012      Los Alamos National Security, LLC.  All rights reserved.
+ * Copyright (c) 2012-2015 Los Alamos National Security, LLC.  All rights reserved.
  * Copyright (c) 2013      Mellanox Technologies, Inc.
  *                         All rights reserved.
  * Copyright (c) 2014      Intel, Inc. All rights reserved.
@@ -161,7 +162,7 @@
 #include "ompi_config.h"
 
 #include "opal/dss/dss_types.h"
-#include "opal/mca/mca.h"
+#include "ompi/mca/mca.h"
 #include "opal/mca/base/base.h"
 
 BEGIN_C_DECLS
@@ -186,8 +187,7 @@ typedef struct ompi_rte_base_component_1_0_0_t ompi_rte_component_t;
  * Macro for use in components that are of type rte
  */
 #define OMPI_RTE_BASE_VERSION_1_0_0 \
-    MCA_BASE_VERSION_2_0_0, \
-    "rte", 2, 0, 0
+    OMPI_MCA_BASE_VERSION_2_1_0("rte", 2, 0, 0)
 
 END_C_DECLS