From e5f90eaadc0c89c097d970642504ffd787a62273 Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Tue, 2 Jan 2007 16:17:47 +0000
Subject: [PATCH] Repair an abstraction violation - OPAL components should
 refer to OPAL version numbers, not OMPI version numbers.

This now allows OPAL to be built separately.

This commit was SVN r12955.
---
 .../maffinity/first_use/maffinity_first_use_component.c   | 8 ++++----
 opal/mca/maffinity/libnuma/maffinity_libnuma_component.c  | 2 +-
 opal/mca/paffinity/linux/paffinity_linux_component.c      | 8 ++++----
 opal/mca/paffinity/solaris/paffinity_solaris_component.c  | 8 ++++----
 opal/mca/paffinity/windows/paffinity_windows_component.c  | 8 ++++----
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/opal/mca/maffinity/first_use/maffinity_first_use_component.c b/opal/mca/maffinity/first_use/maffinity_first_use_component.c
index 502b431792..b0d47daf23 100644
--- a/opal/mca/maffinity/first_use/maffinity_first_use_component.c
+++ b/opal/mca/maffinity/first_use/maffinity_first_use_component.c
@@ -26,7 +26,7 @@
  * Public string showing the maffinity ompi_first_use component version number
  */
 const char *opal_maffinity_first_use_component_version_string =
-    "OPAL first_use maffinity MCA component version " OMPI_VERSION;
+    "OPAL first_use maffinity MCA component version " OPAL_VERSION;
 
 /*
  * Local function
@@ -52,9 +52,9 @@ const opal_maffinity_base_component_1_0_0_t mca_maffinity_first_use_component =
         /* Component name and version */
 
         "first_use",
-        OMPI_MAJOR_VERSION,
-        OMPI_MINOR_VERSION,
-        OMPI_RELEASE_VERSION,
+        OPAL_MAJOR_VERSION,
+        OPAL_MINOR_VERSION,
+        OPAL_RELEASE_VERSION,
 
         /* Component open and close functions */
 
diff --git a/opal/mca/maffinity/libnuma/maffinity_libnuma_component.c b/opal/mca/maffinity/libnuma/maffinity_libnuma_component.c
index f3b44b2eb0..59837cff03 100644
--- a/opal/mca/maffinity/libnuma/maffinity_libnuma_component.c
+++ b/opal/mca/maffinity/libnuma/maffinity_libnuma_component.c
@@ -26,7 +26,7 @@
  * Public string showing the maffinity ompi_libnuma component version number
  */
 const char *opal_maffinity_libnuma_component_version_string =
-    "OPAL libnuma maffinity MCA component version " OMPI_VERSION;
+    "OPAL libnuma maffinity MCA component version " OPAL_VERSION;
 
 /*
  * Local function
diff --git a/opal/mca/paffinity/linux/paffinity_linux_component.c b/opal/mca/paffinity/linux/paffinity_linux_component.c
index d373bd61aa..c55208773a 100644
--- a/opal/mca/paffinity/linux/paffinity_linux_component.c
+++ b/opal/mca/paffinity/linux/paffinity_linux_component.c
@@ -32,7 +32,7 @@
  * Public string showing the paffinity ompi_linux component version number
  */
 const char *opal_paffinity_linux_component_version_string =
-    "OPAL linux paffinity MCA component version " OMPI_VERSION;
+    "OPAL linux paffinity MCA component version " OPAL_VERSION;
 
 /*
  * Local function
@@ -58,9 +58,9 @@ const opal_paffinity_base_component_1_0_0_t mca_paffinity_linux_component = {
         /* Component name and version */
 
         "linux",
-        OMPI_MAJOR_VERSION,
-        OMPI_MINOR_VERSION,
-        OMPI_RELEASE_VERSION,
+        OPAL_MAJOR_VERSION,
+        OPAL_MINOR_VERSION,
+        OPAL_RELEASE_VERSION,
 
         /* Component open and close functions */
 
diff --git a/opal/mca/paffinity/solaris/paffinity_solaris_component.c b/opal/mca/paffinity/solaris/paffinity_solaris_component.c
index 485cbf9e37..34f2ab9d56 100644
--- a/opal/mca/paffinity/solaris/paffinity_solaris_component.c
+++ b/opal/mca/paffinity/solaris/paffinity_solaris_component.c
@@ -32,7 +32,7 @@
  * Public string showing the paffinity ompi_solaris component version number
  */
 const char *opal_paffinity_solaris_component_version_string =
-    "OPAL solaris paffinity MCA component version " OMPI_VERSION;
+    "OPAL solaris paffinity MCA component version " OPAL_VERSION;
 
 /*
  * Local function
@@ -58,9 +58,9 @@ const opal_paffinity_base_component_1_0_0_t mca_paffinity_solaris_component = {
         /* Component name and version */
 
         "solaris",
-        OMPI_MAJOR_VERSION,
-        OMPI_MINOR_VERSION,
-        OMPI_RELEASE_VERSION,
+        OPAL_MAJOR_VERSION,
+        OPAL_MINOR_VERSION,
+        OPAL_RELEASE_VERSION,
 
         /* Component open and close functions */
 
diff --git a/opal/mca/paffinity/windows/paffinity_windows_component.c b/opal/mca/paffinity/windows/paffinity_windows_component.c
index fa0bd2cbe7..0969b888ce 100644
--- a/opal/mca/paffinity/windows/paffinity_windows_component.c
+++ b/opal/mca/paffinity/windows/paffinity_windows_component.c
@@ -32,7 +32,7 @@
  * Public string showing the paffinity ompi_windows component version number
  */
 const char *opal_paffinity_windows_component_version_string =
-    "OPAL windows paffinity MCA component version " OMPI_VERSION;
+    "OPAL windows paffinity MCA component version " OPAL_VERSION;
 
 /*
  * Local function
@@ -58,9 +58,9 @@ const opal_paffinity_base_component_1_0_0_t mca_paffinity_windows_component = {
         /* Component name and version */
 
         "windows",
-        OMPI_MAJOR_VERSION,
-        OMPI_MINOR_VERSION,
-        OMPI_RELEASE_VERSION,
+        OPAL_MAJOR_VERSION,
+        OPAL_MINOR_VERSION,
+        OPAL_RELEASE_VERSION,
 
         /* Component open and close functions */