Fix some problems noted by Ralph:

* Fix disabling hwloc build (i.e., put the AM_CONDITIONALs where they
   belong in the configure.m4 file)
 * Update some svn:ignores
 * r23142 removed some extraneous code, but forgot to remove the
   variables used only by that code

This commit was SVN r23152.

The following SVN revision numbers were found above:
  r23142 --> open-mpi/ompi@610fc67d12

opal/mca/paffinity/hwloc/configure.m4

@@ -28,6 +28,9 @@ m4_include(opal/mca/paffinity/hwloc/hwloc/config/hwloc_check_visibility.m4)
 # MCA_paffinity_hwloc_POST_CONFIG()
 # ---------------------------------
 AC_DEFUN([MCA_paffinity_hwloc_POST_CONFIG],[
+    AM_CONDITIONAL([OPAL_PAFFINITY_HWLOC_INTERNAL],
+                   [test "$paffinity_hwloc_location" = "internal"])
+
     HWLOC_DO_AM_CONDITIONALS
 ])dnl
 
@@ -35,7 +38,7 @@ AC_DEFUN([MCA_paffinity_hwloc_POST_CONFIG],[
 # MCA_paffinity_hwloc_CONFIG([action-if-found], [action-if-not-found])
 # --------------------------------------------------------------------
 AC_DEFUN([MCA_paffinity_hwloc_CONFIG],[
-    OMPI_VAR_SCOPE_PUSH([HWLOC_VERSION opal_check_hwloc_happy paffinity_hwloc_location opal_check_hwloc_save_CPPFLAGS opal_check_hwloc_save_LDFLAGS opal_check_hwloc_save_LIBS])
+    OMPI_VAR_SCOPE_PUSH([HWLOC_VERSION opal_check_hwloc_happy opal_check_hwloc_save_CPPFLAGS opal_check_hwloc_save_LDFLAGS opal_check_hwloc_save_LIBS])
 
     # Allowing building using either the internal copy of
     # hwloc, or an external version.
@@ -122,8 +125,6 @@ AC_DEFUN([MCA_paffinity_hwloc_CONFIG],[
     AC_SUBST([paffinity_hwloc_LIBS])
 
     # Done!
-    AM_CONDITIONAL([OPAL_PAFFINITY_HWLOC_INTERNAL],
-                   [test "$paffinity_hwloc_location" = "internal"])
     AS_IF([test "$opal_check_hwloc_happy" = "yes"],
           [AC_DEFINE_UNQUOTED([PAFFINITY_HWLOC_HWLOC_VERSION], 
                               ["$HWLOC_VERSION"], 

opal/mca/paffinity/hwloc/hwloc/config/hwloc.m4

@@ -79,12 +79,19 @@ EOF])
     # Debug mode?
     AC_MSG_CHECKING([if want hwloc maintainer support])
     hwloc_debug=
-    AS_IF([test "$enable_debug" = "yes"],
-          [hwloc_debug=1
-           hwloc_debug_msg="enabled"])
-    AS_IF([test "$hwloc_debug" = "" -a "$hwloc_mode" = "embedded" -a "$enable_debug" = ""],
+
+    # Unconditionally disable debug mode in embedded mode; if someone
+    # asks, we can add a configure-time option for it.  Disable it
+    # now, however, because --enable-debug is not even added as an
+    # option when configuring in embedded mode, and we wouldn't want
+    # to hijack the enclosing application's --enable-debug configure
+    # switch.
+    AS_IF([test "$hwloc_mode" = "embedded"],
           [hwloc_debug=0
            hwloc_debug_msg="disabled (embedded mode)"])
+    AS_IF([test "$hwloc_debug" = "" -a "$enable_debug" = "yes"],
+          [hwloc_debug=1
+           hwloc_debug_msg="enabled"])
     AS_IF([test "$hwloc_debug" = "" -a "$enable_debug" = "" -a -d .svn],
           [hwloc_debug=1
            hwloc_debug_msg="enabled (SVN checkout default)"])

opal/mca/paffinity/hwloc/paffinity_hwloc_module.c

@@ -466,10 +466,8 @@ static int module_get_physical_socket_id(int logical_socket_id)
 static int module_get_physical_core_id(int physical_socket_id, 
                                        int logical_core_id)
 {
-    int i;
     unsigned count = 0;
     hwloc_obj_t obj;
-    hwloc_cpuset_t good;
     hwloc_topology_t *t = &mca_paffinity_hwloc_component.topology;
 
     obj = hwloc_get_root_obj(*t);