From 9e35f80ab681553ec86394b9f692eb62ba5a6d88 Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Tue, 30 Sep 2014 20:43:25 +0000
Subject: [PATCH] Don't multiply define WANT_PMI_SUPPORT and friends. Turns out
 they weren't being used anywhere anyway, so no point in defining them at all

This commit was SVN r32822.
---
 config/opal_check_pmi.m4                   | 23 ----------------------
 opal/mca/pmix/cray/pmix_cray_pmap_parser.c |  3 ---
 opal/mca/pmix/s2/pmi2_pmap_parser.c        |  3 ---
 3 files changed, 29 deletions(-)

diff --git a/config/opal_check_pmi.m4 b/config/opal_check_pmi.m4
index b683fae999..e71202c8d5 100644
--- a/config/opal_check_pmi.m4
+++ b/config/opal_check_pmi.m4
@@ -28,27 +28,13 @@
 # --------------------------------------------------------
 AC_DEFUN([OPAL_CHECK_CRAY_PMI],[
 
-    # set defaults
-    opal_have_pmi1=0
-    opal_enable_pmi2=0
-
     PKG_CHECK_MODULES([CRAY_PMI], [cray-pmi],
                       [$1_LDFLAGS="$CRAY_PMI_LIBS"
                        $1_CPPFLAGS="$CRAY_PMI_CFLAGS"
                        $1_LIBS="$1_LDFLAGS"
-                        opal_have_pmi1=1
-                        opal_enable_pmi2=1
                         $2],
                        [AC_MSG_RESULT([no])
                         $3])
-   AC_DEFINE_UNQUOTED([WANT_PMI_SUPPORT],
-                      [$opal_enable_pmi],
-                      [Whether we want PMI support])
-   AC_DEFINE_UNQUOTED([WANT_PMI2_SUPPORT],
-                      [$opal_have_pmi2],
-                      [Whether we have PMI2 support])
-   AM_CONDITIONAL(WANT_PMI_SUPPORT, [test "$opal_enable_pmi" = 1])
-   AM_CONDITIONAL(WANT_PMI2_SUPPORT, [test "$opal_have_pmi2" = 1])
 ])
 
 
@@ -166,13 +152,4 @@ AC_DEFUN([OPAL_CHECK_PMI],[
     CPPFLAGS="$opal_check_pmi_$1_save_CPPFLAGS"
     LDFLAGS="$opal_check_pmi_$1_save_LDFLAGS"
     LIBS="$opal_check_pmi_$1_save_LIBS"
-
-   AC_DEFINE_UNQUOTED([WANT_PMI_SUPPORT],
-                      [$opal_enable_pmi],
-                      [Whether we want PMI support])
-   AC_DEFINE_UNQUOTED([WANT_PMI2_SUPPORT],
-                      [$opal_have_pmi2],
-                      [Whether we have PMI2 support])
-   AM_CONDITIONAL(WANT_PMI_SUPPORT, [test "$opal_enable_pmi" = 1])
-   AM_CONDITIONAL(WANT_PMI2_SUPPORT, [test "$opal_have_pmi2" = 1])
 ])
diff --git a/opal/mca/pmix/cray/pmix_cray_pmap_parser.c b/opal/mca/pmix/cray/pmix_cray_pmap_parser.c
index 91edf150ba..e4a5d2c017 100644
--- a/opal/mca/pmix/cray/pmix_cray_pmap_parser.c
+++ b/opal/mca/pmix/cray/pmix_cray_pmap_parser.c
@@ -12,9 +12,6 @@
  */
 
 #include "pmix_cray_pmap_parser.h"
-#ifdef STANDALONE_TEST
-#define WANT_PMI2_SUPPORT 1
-#endif
 
 /**
  pmi2 process mapping is returned as a 
diff --git a/opal/mca/pmix/s2/pmi2_pmap_parser.c b/opal/mca/pmix/s2/pmi2_pmap_parser.c
index 4f0d43f045..7d2725475a 100644
--- a/opal/mca/pmix/s2/pmi2_pmap_parser.c
+++ b/opal/mca/pmix/s2/pmi2_pmap_parser.c
@@ -12,9 +12,6 @@
  */
 
 #include "pmi2_pmap_parser.h"
-#ifdef STANDALONE_TEST
-#define WANT_PMI2_SUPPORT 1
-#endif
 
 /**
  pmi2 process mapping is returned as a