Cleanup the --without-hwloc build. Thanks to Paul Hargrove for reporting it broken.

This commit was SVN r25931.

orte/mca/odls/default/odls_default_module.c

@@ -340,6 +340,7 @@ static int write_help_msg(int fd, pipe_err_msg_t *msg, const char *file,
 
 /* Called from the child to send a warning show_help message up the
    pipe to the waiting parent. */
+#if OPAL_HAVE_HWLOC
 static int send_warn_show_help(int fd, const char *file, 
                                const char *topic, ...)
 {
@@ -357,7 +358,7 @@ static int send_warn_show_help(int fd, const char *file,
 
     return ret;
 }
-
+#endif
 
 /* Called from the child to send an error message up the pipe to the
    waiting parent. */

orte/mca/plm/base/plm_base_launch_support.c

@@ -79,8 +79,8 @@ int orte_plm_base_setup_job(orte_job_t *jdata)
     int rc;
     int32_t ljob;
     int i;
-    orte_node_t *node;
 #if OPAL_HAVE_HWLOC
+    orte_node_t *node;
     hwloc_topology_t t0;
 #endif
 

orte/mca/rmaps/rank_file/configure.m4

@@ -13,7 +13,7 @@
 AC_DEFUN([MCA_orte_rmaps_rank_file_CONFIG], [
     AC_CONFIG_FILES([orte/mca/rmaps/rank_file/Makefile])
 
-    AS_IF([test "$orte_without_full_support" = 0],
+    AS_IF([test "$orte_without_full_support" = 0 -a "$OPAL_HAVE_HWLOC" = 1],
           [$1],
           [$2])
 ])