- On Cray XT systems stop the grpcomm basic component from building.

grpcomm cnos component
  - Remove the .ompi_ignore
  - add a configure.m4 that should keep it from building on any system
    other than Cray XT* (copied from rml/cnos)
  - Fix some mis-named symbols resulting from cut/paste errors.

This patch brings the Cray build back into 'working' order.

This commit was SVN r15651.

contrib/platform/cray_xt3_romio

@@ -6,7 +6,7 @@ enable_pretty_print_stacktrace=no
 enable_dlopen=no
 with_portals_config=redstorm
 with_memory_manager=none
-enable_mca_no_build=maffinity-first_use,maffinity-libnuma,paffinity-linux,timer-linux,gpr-proxy,gpr-replica,iof-svc,ns-proxy,oob-tcp,pls-rsh,ras-dash_host,ras-hostfile,ras-localhost,rds-hostfile,rds-resfile,rmaps-round_robin,rmgr-proxy,rmgr-urm,rml-oob,sds-env,sds-seed,sds-singleton,btl-sm,btl-self,coll-hierarch,coll-sm,common-sm,mpool-sm,pml-dr,filem-rsh
+enable_mca_no_build=maffinity-first_use,maffinity-libnuma,paffinity-linux,timer-linux,gpr-proxy,gpr-replica,iof-svc,ns-proxy,oob-tcp,pls-rsh,ras-dash_host,ras-hostfile,ras-localhost,rds-hostfile,rds-resfile,rmaps-round_robin,rmgr-proxy,rmgr-urm,rml-oob,sds-env,sds-seed,sds-singleton,btl-sm,btl-self,coll-hierarch,coll-sm,common-sm,mpool-sm,pml-dr,filem-rsh,grpcomm-basic
 enable_heterogeneous=no
 enable_pty_support=no
 enable_mem_debug=no

contrib/platform/redstorm

@@ -6,7 +6,7 @@ enable_pretty_print_stacktrace=no
 enable_dlopen=no
 with_portals_config=redstorm
 with_memory_manager=none
-enable_mca_no_build=maffinity-first_use,maffinity-libnuma,paffinity-linux,timer-linux,gpr-proxy,gpr-replica,iof-svc,ns-proxy,oob-tcp,pls-rsh,ras-dash_host,ras-hostfile,ras-localhost,rds-hostfile,rds-resfile,rmaps-round_robin,rmgr-proxy,rmgr-urm,rml-oob,sds-env,sds-seed,sds-singleton,btl-sm,btl-self,coll-hierarch,coll-sm,common-sm,mpool-sm,pml-dr,filem-rsh
+enable_mca_no_build=maffinity-first_use,maffinity-libnuma,paffinity-linux,timer-linux,gpr-proxy,gpr-replica,iof-svc,ns-proxy,oob-tcp,pls-rsh,ras-dash_host,ras-hostfile,ras-localhost,rds-hostfile,rds-resfile,rmaps-round_robin,rmgr-proxy,rmgr-urm,rml-oob,sds-env,sds-seed,sds-singleton,btl-sm,btl-self,coll-hierarch,coll-sm,common-sm,mpool-sm,pml-dr,filem-rsh,grpcomm-basic
 enable_heterogeneous=no
 enable_pty_support=no
 enable_mem_debug=no

orte/mca/grpcomm/cnos/configure.m4

@@ -0,0 +1,40 @@
+# -*- shell-script -*-
+#
+# 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$
+#
+
+# MCA_grpcomm_cnos_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
+AC_DEFUN([MCA_grpcomm_cnos_CONFIG],[
+    grpcomm_cnos_happy="no"
+    # see if we should enable super secret utcp support
+    if test "$with_grpcomm_cnos" = "utcp" ; then
+        grpcomm_cnos_happy="yes"
+        grpcomm_cnos_barrier=0
+    else
+        # check for cnos functions
+        AC_CHECK_FUNC([cnos_barrier], 
+                      [grpcomm_cnos_happy="yes"
+                       grpcomm_cnos_barrier=1], 
+                      [grpcomm_cnos_happy="no"
+                       grpcomm_cnos_barrier=0])
+    fi
+
+    AC_DEFINE_UNQUOTED([OMPI_GRPCOMM_CNOS_HAVE_BARRIER], [$grpcomm_cnos_barrier],
+                       [whether to use cnos_barrier or not])
+    AS_IF([test "$grpcomm_cnos_happy" = "yes"], [$1], [$2])
+])dnl

orte/mca/grpcomm/cnos/grpcomm_cnos_module.c

@@ -42,7 +42,7 @@
 
 #include "grpcomm_cnos.h"
 
-#if OMPI_RML_CNOS_HAVE_BARRIER
+#if OMPI_GRPCOMM_CNOS_HAVE_BARRIER
 #include <catamount/cnos_mpi_os.h>
 #endif
 
@@ -111,7 +111,7 @@ static int xcast_gate(orte_gpr_trigger_cb_fn_t cbfunc)
 static int
 orte_grpcomm_cnos_barrier(void)
 {
-#if OMPI_RML_CNOS_HAVE_BARRIER
+#if OMPI_GRPCOMM_CNOS_HAVE_BARRIER
     cnos_barrier();
 #endif