Ensure that we only add -lpmi once to the wrapper compilers, no matter how many components might use it.

This commit was SVN r25753.

ompi/mca/pubsub/pmi/configure.m4

@@ -17,8 +17,11 @@ AC_DEFUN([MCA_ompi_pubsub_pmi_CONFIG], [
     # if check worked, set wrapper flags if so.  
     # Evaluate succeed / fail
     AS_IF([test "$pubsub_pmi_good" = 1],
-          [pubsub_pmi_WRAPPER_EXTRA_LDFLAGS="$pubsub_pmi_LDFLAGS"
-           pubsub_pmi_WRAPPER_EXTRA_LIBS="$pubsub_pmi_LIBS"
+          [if test -z "$orte_pmi_wrapper_flags_added"; then
+              orte_pmi_wrapper_flags_added=yes
+              WRAPPER_EXTRA_LDFLAGS="$WRAPPER_EXTRA_LDFLAGS $pubsub_pmi_LDFLAGS"
+              WRAPPER_EXTRA_LIBS="$WRAPPER_EXTRA_LIBS $pubsub_pmi_LIBS"
+           fi
            $1],
           [$2])
 

orte/mca/ess/pmi/configure.m4

@@ -22,8 +22,11 @@ AC_DEFUN([MCA_orte_ess_pmi_CONFIG],[
     # if check worked, set wrapper flags if so.  
     # Evaluate succeed / fail
     AS_IF([test "$ess_pmi_good" = "1" -a "$orte_without_full_support" = 0],
-          [ess_pmi_WRAPPER_EXTRA_LDFLAGS="$ess_pmi_LDFLAGS"
-           ess_pmi_WRAPPER_EXTRA_LIBS="$ess_pmi_LIBS"
+          [if test -z "$orte_pmi_wrapper_flags_added"; then
+              orte_pmi_wrapper_flags_added=yes
+              WRAPPER_EXTRA_LDFLAGS="$WRAPPER_EXTRA_LDFLAGS $ess_pmi_LDFLAGS"
+              WRAPPER_EXTRA_LIBS="$WRAPPER_EXTRA_LIBS $ess_pmi_LIBS"
+           fi
            $1],
           [$2])
 

orte/mca/grpcomm/pmi/configure.m4

@@ -21,8 +21,11 @@ AC_DEFUN([MCA_orte_grpcomm_pmi_CONFIG], [
     # if check worked, set wrapper flags if so.  
     # Evaluate succeed / fail
     AS_IF([test "$grpcomm_pmi_good" = 1 -a "$orte_without_full_support" = 0],
-          [grpcomm_pmi_WRAPPER_EXTRA_LDFLAGS="$grpcomm_pmi_LDFLAGS"
-           grpcomm_pmi_WRAPPER_EXTRA_LIBS="$grpcomm_pmi_LIBS"
+          [if test -z "$orte_pmi_wrapper_flags_added"; then
+              orte_pmi_wrapper_flags_added=yes
+              WRAPPER_EXTRA_LDFLAGS="$WRAPPER_EXTRA_LDFLAGS $grpcomm_pmi_LDFLAGS"
+              WRAPPER_EXTRA_LIBS="$WRAPPER_EXTRA_LIBS $grpcomm_pmi_LIBS"
+           fi
            $1],
           [$2])