From 89253629f007a5c77cb71a91fd0fe626116cbd02 Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Wed, 21 Jun 2023 00:33:15 -0400 Subject: [PATCH] Allow the monitoring infrastructure to be compiled. Signed-off-by: George Bosilca (cherry picked from commit 21e3d1170e57ffe39fb6310ea2d33b3c1bd62fef) --- ompi/mca/coll/monitoring/configure.m4 | 5 +---- ompi/mca/common/monitoring/configure.m4 | 11 ++++------- ompi/mca/osc/monitoring/configure.m4 | 5 +---- ompi/mca/pml/monitoring/configure.m4 | 5 +---- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/ompi/mca/coll/monitoring/configure.m4 b/ompi/mca/coll/monitoring/configure.m4 index 008bff46994..1d0b88fcb26 100644 --- a/ompi/mca/coll/monitoring/configure.m4 +++ b/ompi/mca/coll/monitoring/configure.m4 @@ -15,9 +15,6 @@ # ------------------------------------------------ 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]) + [$1] ])dnl diff --git a/ompi/mca/common/monitoring/configure.m4 b/ompi/mca/common/monitoring/configure.m4 index b7632bd4b8d..11cd33b3e8c 100644 --- a/ompi/mca/common/monitoring/configure.m4 +++ b/ompi/mca/common/monitoring/configure.m4 @@ -16,13 +16,10 @@ AC_DEFUN([MCA_ompi_common_monitoring_CONFIG],[ AC_CONFIG_FILES([ompi/mca/common/monitoring/Makefile]) - m4_ifdef([project_ompi], [ - m4_ifdef([MCA_BUILD_ompi_common_monitoring_DSO_TRUE], - [AC_CONFIG_LINKS(profile2mat.pl:test/monitoring/profile2mat.pl - aggregate_profile.pl:test/monitoring/aggregate_profile.pl)])]) + m4_ifdef([project_ompi], + [AC_CONFIG_LINKS(test/monitoring/profile2mat.pl:ompi/mca/common/monitoring/profile2mat.pl + test/monitoring/aggregate_profile.pl:ompi/mca/common/monitoring/aggregate_profile.pl)]) - AS_IF([test "$MCA_BUILD_ompi_common_monitoring_DSO_TRUE" = ''], - [$1], - [$2]) + [$1] ])dnl diff --git a/ompi/mca/osc/monitoring/configure.m4 b/ompi/mca/osc/monitoring/configure.m4 index f3cd355b8d7..8ef5dc01e27 100644 --- a/ompi/mca/osc/monitoring/configure.m4 +++ b/ompi/mca/osc/monitoring/configure.m4 @@ -91,10 +91,7 @@ EOF AC_DEFUN( [MCA_ompi_osc_monitoring_CONFIG], [AC_CONFIG_FILES([ompi/mca/osc/monitoring/Makefile]) - - AS_IF([test "$MCA_BUILD_ompi_common_monitoring_DSO_TRUE" = ''], - [$1], - [$2]) + [$1] MCA_OMPI_OSC_MONITORING_GENERATE_TEMPLATES( [ompi/mca/osc/monitoring/osc_monitoring_template_gen.h], diff --git a/ompi/mca/pml/monitoring/configure.m4 b/ompi/mca/pml/monitoring/configure.m4 index 27815f22957..ffc2bcf5fc4 100644 --- a/ompi/mca/pml/monitoring/configure.m4 +++ b/ompi/mca/pml/monitoring/configure.m4 @@ -15,10 +15,7 @@ # ------------------------------------------------ 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]) + [$1] ])dnl