From 16beaa3878d25cf7209cbed5eb19d5e64bdc03d0 Mon Sep 17 00:00:00 2001 From: Joshua Ladd Date: Thu, 11 Jul 2013 09:55:46 +0000 Subject: [PATCH] This fixes the nasty configure.m4 hack that was added long ago and not removed. My fault for not catching earlier. I've also removed the '.ompi_ignore' in coll/hcoll. Throwing this to Nathan for review. Upon successful review, this should be added to cmr:v1.7:reviewer=hjelmn This commit was SVN r28753. --- config/ompi_check_libhcoll.m4 | 10 ---------- ompi/mca/coll/hcoll/.ompi_ignore | 0 2 files changed, 10 deletions(-) delete mode 100644 ompi/mca/coll/hcoll/.ompi_ignore diff --git a/config/ompi_check_libhcoll.m4 b/config/ompi_check_libhcoll.m4 index 67b554a1e5..3df4b3ae08 100644 --- a/config/ompi_check_libhcoll.m4 +++ b/config/ompi_check_libhcoll.m4 @@ -52,16 +52,6 @@ AC_DEFUN([OMPI_CHECK_HCOLL],[ [ompi_check_hcoll_happy="no"]) ]) - MCA_COMPONENT_BUILD_CHECK([ompi],[coll],[ml], - [AM_COND_IF( - MCA_BUILD_ompi_coll_ml_DSO, - [], - [AC_MSG_ERROR([Can not use coll/hcoll and coll/ml (static build) simultaneously. You have two options: - 1. Use static build & disable ml with: --enable-mpi-no-build=coll-ml] - 2. Use dso build for ML & disable ml at runtime: -mca coll self,basic,hcoll,tuned,libnbc)] - ) - ], - []) AS_IF([test "$ompi_check_hcoll_happy" = "yes" -a "$enable_progress_threads" = "yes"], diff --git a/ompi/mca/coll/hcoll/.ompi_ignore b/ompi/mca/coll/hcoll/.ompi_ignore deleted file mode 100644 index e69de29bb2..0000000000