Some components were still using OMPI_*_VERSION instead of OPAL_*_VERSION, so convert them over (Jeff is taking care of PLPA, so that is not included here).

This commit was SVN r21384.

opal/mca/crs/blcr/crs_blcr_component.c

@@ -46,9 +46,9 @@ opal_crs_blcr_component_t mca_crs_blcr_component = {
 
             /* Component name and version */
             "blcr",
-            OMPI_MAJOR_VERSION,
-            OMPI_MINOR_VERSION,
-            OMPI_RELEASE_VERSION,
+            OPAL_MAJOR_VERSION,
+            OPAL_MINOR_VERSION,
+            OPAL_RELEASE_VERSION,
             
             /* Component open and close functions */
             crs_blcr_open,

opal/mca/crs/self/crs_self_component.c

@@ -26,7 +26,7 @@
  * Public string for version number
  */
 const char *opal_crs_self_component_version_string = 
-"OPAL CRS self MCA component version " OMPI_VERSION;
+"OPAL CRS self MCA component version " OPAL_VERSION;
 
 /*
  * Local functionality
@@ -49,9 +49,9 @@ opal_crs_self_component_t mca_crs_self_component = {
 
             /* Component name and version */
             "self",
-            OMPI_MAJOR_VERSION,
-            OMPI_MINOR_VERSION,
-            OMPI_RELEASE_VERSION,
+            OPAL_MAJOR_VERSION,
+            OPAL_MINOR_VERSION,
+            OPAL_RELEASE_VERSION,
             
             /* Component open and close functions */
             crs_self_open,

opal/mca/memchecker/valgrind/memchecker_valgrind_component.c

@@ -29,7 +29,7 @@
  * Public string showing the memchecker ompi_linux component version number
  */
 const char *opal_memchecker_valgrind_component_version_string =
-    "OPAL valgrind memchecker MCA component version " OMPI_VERSION;
+    "OPAL valgrind memchecker MCA component version " OPAL_VERSION;
 
 /*
  * Local function
@@ -51,9 +51,9 @@ const opal_memchecker_base_component_2_0_0_t mca_memchecker_valgrind_component =
 
         /* Component name and version */
         "valgrind",
-        OMPI_MAJOR_VERSION,
-        OMPI_MINOR_VERSION,
-        OMPI_RELEASE_VERSION,
+        OPAL_MAJOR_VERSION,
+        OPAL_MINOR_VERSION,
+        OPAL_RELEASE_VERSION,
 
         /* Component open and close functions */
         valgrind_open,