Protecting the apm code with OMPI_HAVE_THREADS.

This commit was SVN r17284.

ompi/mca/btl/openib/btl_openib_component.c

@@ -395,6 +395,7 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_hca_t *hca,
         lmc = mca_btl_openib_component.max_lmc;
     }
 
+#if OMPI_HAVE_THREADS
     /* APM support */
     if (lmc > 1){
         if (-1 == mca_btl_openib_component.apm) {
@@ -413,6 +414,7 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_hca_t *hca,
             opal_show_help("help-mpi-btl-openib.txt", "apm without lmc",true);
         }
     }
+#endif
 
     for(lid = ib_port_attr->lid;
             lid < ib_port_attr->lid + lmc; lid += lmc_step){

ompi/mca/btl/openib/btl_openib_endpoint.c

@@ -541,6 +541,7 @@ void mca_btl_openib_endpoint_connected(mca_btl_openib_endpoint_t *endpoint)
     }
 
     /* Run over all qps and load alternative path */
+#if OMPI_HAVE_THREADS
     if (0 != mca_btl_openib_component.apm) {
         int i;
         if (MCA_BTL_XRC_ENABLED) {
@@ -551,6 +552,7 @@ void mca_btl_openib_endpoint_connected(mca_btl_openib_endpoint_t *endpoint)
             }
         }
     }
+#endif
 
     endpoint->endpoint_state = MCA_BTL_IB_CONNECTED;
     endpoint->endpoint_btl->hca->non_eager_rdma_endpoints++;

ompi/mca/btl/openib/btl_openib_mca.c

@@ -402,12 +402,12 @@ int btl_openib_register_mca_params(void)
                   0, &ival, REGINT_GE_ZERO));
     mca_btl_openib_component.max_lmc = (uint32_t) ival;
 
+#if OMPI_HAVE_THREADS
     CHECK(reg_int("enable_apm", "Maximum number of alterative paths for each HCA port "
                   "(must be >= -1, where 0 = disable apm, -1 = all availible alternative paths )",
                   0, &ival, REGINT_NEG_ONE_OK|REGINT_GE_ZERO));
     mca_btl_openib_component.apm = (uint32_t) ival;
 
-#if OMPI_HAVE_THREADS
     CHECK(reg_int("use_async_event_thread",
                 "If nonzero, use the thread that will handle InfiniBand asyncihronous events ",
                 1, &ival, 0));