Fix --without-hwloc builds

cmr=v1.7.4:reviewer=jsquyres

This commit was SVN r30462.

orte/mca/rmaps/base/rmaps_base_frame.c

@@ -364,6 +364,7 @@ static int orte_rmaps_base_open(mca_base_open_flag_t flags)
                                orte_rmaps_base_print_mapping(orte_rmaps_base.mapping));
                 return ORTE_ERR_SILENT;
         }
+#if OPAL_HAVE_HWLOC
         /* if we were asked for multiple cpus/proc, then we have to
          * bind to those cpus - any other binding policy is an
          * error
@@ -390,6 +391,7 @@ static int orte_rmaps_base_open(mca_base_open_flag_t flags)
                 return ORTE_ERR_SILENT;
             }
         }
+#endif
     }
 
     /* Should we schedule on the local node or not? */

orte/mca/rmaps/base/rmaps_base_ranking.c

@@ -601,7 +601,9 @@ int orte_rmaps_base_compute_vpids(orte_job_t *jdata,
         return ORTE_SUCCESS;
     }
 
+#if OPAL_HAVE_HWLOC
  rankbyslot:
+#endif
     if (ORTE_RANK_BY_SLOT == ORTE_GET_RANKING_POLICY(map->ranking)) {
         /* assign the ranks sequentially */
         opal_output_verbose(5, orte_rmaps_base_framework.framework_output,