Ensure to disable XML and Cairo support in hwloc; OMPI doesn't use it. Additionally, ensure that the right flags are passed back to the wrappers in the case of static builds. We probably won't need these (especially since XML has been disabled), but it's the Right Thing to do.

This commit was SVN r24451.

opal/mca/common/hwloc/configure.m4

@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2010-2011 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -63,7 +63,7 @@ AC_DEFUN([MCA_opal_common_hwloc_POST_CONFIG],[
 AC_DEFUN([MCA_opal_common_hwloc_CONFIG],[
     AC_CONFIG_FILES([opal/mca/common/hwloc/Makefile])
 
-    OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_common_hwloc_save_CPPFLAGS opal_common_hwloc_save_LDFLAGS opal_common_hwloc_save_LIBS opal_common_hwloc_support_value])
+    OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_common_hwloc_save_CPPFLAGS opal_common_hwloc_save_LDFLAGS opal_common_hwloc_save_LIBS opal_common_hwloc_support_value opal_common_hwloc_save_xml opal_common_hwloc_save_cairo])
 
     # Allowing building using either the internal copy of
     # hwloc, or an external version.
@@ -106,19 +106,35 @@ AC_DEFUN([MCA_opal_common_hwloc_CONFIG],[
           [# Main hwloc configuration
            AC_MSG_RESULT([internal copy])
            HWLOC_SET_SYMBOL_PREFIX([opal_common_])
+
+           # We don't want no stinkin' XML or graphical support
+           opal_common_hwloc_save_xml=$enable_xml
+           opal_common_hwloc_save_cairo=$enable_cairo
+           enable_xml=no
+           enable_cairo=no
+
            HWLOC_SETUP_CORE([opal/mca/common/hwloc/hwloc], 
                      [AC_MSG_CHECKING([whether hwloc configure succeeded])
                       AC_MSG_RESULT([yes])
                       HWLOC_VERSION="internal v`$srcdir/opal/mca/common/hwloc/hwloc/config/hwloc_get_version.sh $srcdir/opal/mca/common/hwloc/hwloc/VERSION`"
-                      # Add flags to the wrappers for static builds
-                      opal_common_hwloc_WRAPPER_EXTRA_LDFLAGS=$HWLOC_EMBEDDED_LDFLAGS
-                      opal_common_hwloc_WRAPPER_EXTRA_LIBS=$HWLOC_EMBEDDED_LIBS
+
+                      # Add flags to the wrappers for static builds.
+                      # Note that we don't add the project name to the
+                      # wrapper extra flags.  :-(
+                      common_hwloc_WRAPPER_EXTRA_LIBS=$HWLOC_EMBEDDED_LIBS
+
                       opal_common_hwloc_LDFLAGS='$(HWLOC_EMBEDDED_LDFLAGS)'
                       opal_common_hwloc_LIBS='$(top_ompi_builddir)/opal/mca/common/hwloc/hwloc/src/libhwloc_embedded.la $(HWLOC_EMBEDDED_LIBS)'
                       opal_common_hwloc_support=yes], 
                      [AC_MSG_CHECKING([whether hwloc configure succeeded])
                       AC_MSG_RESULT([no])
                       opal_common_hwloc_support=no])
+
+          # Restore some env variables, if necessary
+          AS_IF([test -n "$opal_common_hwloc_save_xml"],
+                [enable_xml=$opal_common_hwloc_save_xml])
+          AS_IF([test -n "$opal_common_hwloc_save_cairo"],
+                [enable_cairo=$opal_common_hwloc_save_cairo])
           ])
 
     # If we are not building internal, then run all the normal checks