[mpich2-commits] r7500 - mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config

[balaji at mcs.anl.gov]

Author: balaji
Date: 2010-11-24 03:23:06 -0600 (Wed, 24 Nov 2010)
New Revision: 7500

Modified:
   mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4
   mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc_internal.m4
Log:
Do not automatically enable debugging or picky compiler options in
hwloc unless the user asked for it.

Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4	2010-11-24 09:22:54 UTC (rev 7499)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4	2010-11-24 09:23:06 UTC (rev 7500)
@@ -92,12 +92,6 @@
     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)"])
-    AS_IF([test "$hwloc_debug" = "" -a "$enable_debug" = "" -a -d .hg],
-          [hwloc_debug=1
-           hwloc_debug_msg="enabled (HG clone default)"])
     AS_IF([test "$hwloc_debug" = ""],
           [hwloc_debug=0
            hwloc_debug_msg="disabled"])

Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc_internal.m4
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc_internal.m4	2010-11-24 09:22:54 UTC (rev 7499)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc_internal.m4	2010-11-24 09:23:06 UTC (rev 7500)
@@ -143,9 +143,6 @@
     # specifically disabled by the user.
     AC_MSG_CHECKING([whether to enable "picky" compiler mode])
     hwloc_want_picky=0
-    AS_IF([test "$GCC" = "yes"],
-          [AS_IF([test -d "$srcdir/.svn" -o -d "$srcdir/.hg"],
-                 [hwloc_want_picky=1])])
     if test "$enable_picky" = "yes"; then
         if test "$GCC" = "yes"; then
             AC_MSG_RESULT([yes])