Fixes trac:1085: Improves SLURM configure logic to also allow OS X or any platform where srun is found in the PATH.

This commit was SVN r18714.

The following Trac tickets were found above:
  Ticket 1085 --> https://svn.open-mpi.org/trac/ompi/ticket/1085

config/ompi_check_slurm.m4

@@ -28,14 +28,22 @@ AC_DEFUN([OMPI_CHECK_SLURM],[
     if test "$with_slurm" = "no" ; then
         ompi_check_slurm_happy="no"
     elif test "$with_slurm" = "" ; then
-        # unless user asked, only build slurm component on
-        # linux systems.
+        # unless user asked, only build slurm component on linux, AIX,
+        # and OS X systems (these are the platforms that SLURM
+        # supports)
         case $host in
-            *-linux*|*-aix*)
+            *-linux*|*-aix*|*-apple-darwin*)
                 ompi_check_slurm_happy="yes"
                 ;;
             *)
-                ompi_check_slurm_happy="no"
+                AC_MSG_CHECKING([for SLURM srun in PATH])
+                OMPI_WHICH([srun], [OMPI_CHECK_SLURM_SRUN])
+                if test "$OMPI_CHECK_SLURM_SRUN" = ""; then
+                    ompi_check_slurm_happy="no"
+                else
+                    ompi_check_slurm_happy="yes"
+                fi
+                AC_MSG_RESULT([$ompi_check_slurm_happy])
                 ;;
         esac
     else 

ompi/mca/btl/openib/mca-btl-openib-hca-params.ini

@@ -133,7 +133,7 @@ mtu = 2048
 
 ############################################################################
 
-[IBM eHCA 4x and 12x ]
+[IBM eHCA 4x and 12x]
 vendor_id = 0x5076
 vendor_part_id = 0
 use_eager_rdma = 1
@@ -142,13 +142,16 @@ receive_queues = P,128,256,192,128:P,65536,256,192,128
 
 ############################################################################
 
-[QLogic InfiniPath]
+# See http://lists.openfabrics.org/pipermail/general/2008-June/051920.html
+# 0x1fc1 and 0x1077 are PCI ID's; at least one of QL's OUIs is 0x1175
+
+[QLogic InfiniPath 1]
 vendor_id = 0x1fc1
 vendor_part_id = 13
 use_eager_rdma = 1
 mtu = 2048
 
-[QLogic InfiniPath]
+[QLogic InfiniPath 2]
 vendor_id = 0x1fc1,0x1077
 vendor_part_id = 16,29216
 use_eager_rdma = 1
@@ -156,6 +159,8 @@ mtu = 4096
 
 ############################################################################
 
+# Chelsio's OUI is 0x0743.  0x1425 is the PCI ID.
+
 [Chelsio T3]
 vendor_id = 0x1425
 vendor_part_id = 0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0030,0x0031,0x0032
@@ -165,6 +170,8 @@ receive_queues = P,65536,256,192,128
 
 ############################################################################
 
+# I'm *assuming* that 0x4040 is the PCI ID...
+
 [NetXen]
 vendor_id = 0x4040
 vendor_part_id = 0x0001,0x0002,0x0003,0x0004,0x0005,0x0024,0x0025,0x0100
@@ -174,9 +181,11 @@ receive_queues = P,65536,248,192,128
 
 ############################################################################
 
+# NE's OUI is 0x1255.  0x1678 is the PCI ID.
+
 [NetEffect NE020]
-vendor_ID = 1678
-vendor_part_id = 0100
+vendor_ID = 0x1678
+vendor_part_id = 0x0100
 use_eager_rdma = 1
 mtu = 2048
 receive_queues = P,128,256,192,128:P,65536,256,192,128