From 64bff0e326ca6bb32083161157c11019412fd99e Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Thu, 29 Jun 2017 21:07:20 +0200 Subject: [PATCH] Disable monitoring if we compile statically. Protect all components against compilation on static builds. Signed-off-by: George Bosilca --- ompi/mca/coll/monitoring/configure.m4 | 23 +++++++++++++++++++++++ ompi/mca/common/monitoring/configure.m4 | 4 +++- ompi/mca/osc/monitoring/configure.m4 | 13 ++++++++----- ompi/mca/pml/monitoring/configure.m4 | 24 ++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 ompi/mca/coll/monitoring/configure.m4 create mode 100644 ompi/mca/pml/monitoring/configure.m4 diff --git a/ompi/mca/coll/monitoring/configure.m4 b/ompi/mca/coll/monitoring/configure.m4 new file mode 100644 index 0000000000..2f72be629b --- /dev/null +++ b/ompi/mca/coll/monitoring/configure.m4 @@ -0,0 +1,23 @@ +# -*- shell-script -*- +# +# Copyright (c) 2017 The University of Tennessee and The University +# of Tennessee Research Foundation. All rights +# reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +# MCA_ompi_coll_monitoring_CONFIG([action-if-can-compile], +# [action-if-cant-compile]) +# ------------------------------------------------ +AC_DEFUN([MCA_ompi_coll_monitoring_CONFIG],[ + AC_CONFIG_FILES([ompi/mca/coll/monitoring/Makefile]) + + AS_IF([test MCA_BUILD_ompi_common_monitoring_DSO_TRUE == ''], + [$1], + [$2]) +])dnl + diff --git a/ompi/mca/common/monitoring/configure.m4 b/ompi/mca/common/monitoring/configure.m4 index 345c3a55d2..5ee7a2cda5 100644 --- a/ompi/mca/common/monitoring/configure.m4 +++ b/ompi/mca/common/monitoring/configure.m4 @@ -22,5 +22,7 @@ AC_DEFUN([MCA_ompi_common_monitoring_CONFIG],[ aggregate_profile.pl:test/monitoring/aggregate_profile.pl)])]) - [$1] + AS_IF([test MCA_BUILD_ompi_common_monitoring_DSO_TRUE == ''], + [$1], + [$2]) ])dnl diff --git a/ompi/mca/osc/monitoring/configure.m4 b/ompi/mca/osc/monitoring/configure.m4 index 24b8bfbd87..2682c47bfc 100644 --- a/ompi/mca/osc/monitoring/configure.m4 +++ b/ompi/mca/osc/monitoring/configure.m4 @@ -11,9 +11,12 @@ # MCA_ompi_osc_monitoring_CONFIG() # ------------------------------------------------ AC_DEFUN([MCA_ompi_osc_monitoring_CONFIG],[ - AC_CONFIG_FILES([ompi/mca/osc/monitoring/Makefile]) + AC_CONFIG_FILES([ompi/mca/osc/monitoring/Makefile]) - OPAL_CHECK_PORTALS4([osc_monitoring], - [AC_DEFINE([OMPI_WITH_OSC_PORTALS4], [1], [Whether or not to generate template for osc_portals4])], - []) - ])dnl + AS_IF([test MCA_BUILD_ompi_common_monitoring_DSO_TRUE == ''], + [$1], + [$2]) + OPAL_CHECK_PORTALS4([osc_monitoring], + [AC_DEFINE([OMPI_WITH_OSC_PORTALS4], [1], [Whether or not to generate template for osc_portals4])], + []) +])dnl diff --git a/ompi/mca/pml/monitoring/configure.m4 b/ompi/mca/pml/monitoring/configure.m4 new file mode 100644 index 0000000000..b559fc1761 --- /dev/null +++ b/ompi/mca/pml/monitoring/configure.m4 @@ -0,0 +1,24 @@ +# -*- shell-script -*- +# +# Copyright (c) 2017 The University of Tennessee and The University +# of Tennessee Research Foundation. All rights +# reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +# MCA_ompi_coll_monitoring_CONFIG([action-if-can-compile], +# [action-if-cant-compile]) +# ------------------------------------------------ +AC_DEFUN([MCA_ompi_pml_monitoring_CONFIG],[ + AC_CONFIG_FILES([ompi/mca/pml/monitoring/Makefile]) + + AS_IF([test MCA_BUILD_ompi_common_monitoring_DSO_TRUE == ''], + [$1], + [$2]) +])dnl + +