From 7c3e42a6894970daa25fc07982cc0cc8c4832f7f Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Tue, 19 Feb 2013 16:19:33 +0000 Subject: [PATCH] Work around issue shown in #3505 by not linking against libpci by default. This commit was SVN r28076. --- opal/mca/hwloc/configure.m4 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/opal/mca/hwloc/configure.m4 b/opal/mca/hwloc/configure.m4 index 4544d89eda..4b4faf4a1f 100644 --- a/opal/mca/hwloc/configure.m4 +++ b/opal/mca/hwloc/configure.m4 @@ -74,6 +74,10 @@ AC_DEFUN([MCA_opal_hwloc_CONFIG_REQUIRE],[ # broken, and will disable it by default. I hate making tests # based on specific version numbers, but I'm out of ideas here. # :-( + # + # hwloc currently links against libpci, which is GPL (not LGPL), + # so disable it by default for now. This needs to be revisited at + # some point. AC_MSG_CHECKING([whether to enable hwloc PCI device support]) AS_IF([test "$enable_hwloc_pci" = "yes"], [AC_MSG_RESULT([yes (--enable-hwloc-pci specified)]) @@ -85,8 +89,8 @@ AC_DEFUN([MCA_opal_hwloc_CONFIG_REQUIRE],[ AS_IF([test "$hwloc_base_pci" != "" -a "$ac_cv_sizeof_void_p" = "8"], [AC_MSG_RESULT([no (SuSE 10/64 bit)]) enable_pci=no], - [AC_MSG_RESULT([defer (default)]) - enable_pci=]) + [AC_MSG_RESULT([no (default)]) + enable_pci=no]) ]) ])