From 17f71fb72f29fce4ee8e352f7afe522796922b28 Mon Sep 17 00:00:00 2001 From: Todd Kordenbrock Date: Mon, 20 Nov 2017 14:17:41 -0600 Subject: [PATCH 1/2] configury: add portals4 include path to osc-monitoring component build Signed-off-by: Todd Kordenbrock --- ompi/mca/osc/monitoring/Makefile.am | 2 ++ ompi/mca/osc/monitoring/configure.m4 | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ompi/mca/osc/monitoring/Makefile.am b/ompi/mca/osc/monitoring/Makefile.am index 6c83b943652..2e1eb759e4f 100644 --- a/ompi/mca/osc/monitoring/Makefile.am +++ b/ompi/mca/osc/monitoring/Makefile.am @@ -19,6 +19,8 @@ monitoring_sources = \ osc_monitoring_module.h \ osc_monitoring_template.h +AM_CPPFLAGS = $(osc_monitoring_portals4_CPPFLAGS) + if MCA_BUILD_ompi_osc_monitoring_DSO component_noinst = component_install = mca_osc_monitoring.la diff --git a/ompi/mca/osc/monitoring/configure.m4 b/ompi/mca/osc/monitoring/configure.m4 index 939efe155b5..b8670099f37 100644 --- a/ompi/mca/osc/monitoring/configure.m4 +++ b/ompi/mca/osc/monitoring/configure.m4 @@ -16,7 +16,11 @@ AC_DEFUN([MCA_ompi_osc_monitoring_CONFIG],[ AS_IF([test "$MCA_BUILD_ompi_common_monitoring_DSO_TRUE" = ''], [$1], [$2]) - OPAL_CHECK_PORTALS4([osc_monitoring], + OPAL_CHECK_PORTALS4([osc_monitoring_portals4], [AC_DEFINE([OMPI_WITH_OSC_PORTALS4], [1], [Whether or not to generate template for osc_portals4])], []) + # substitute in the things needed to build portals4 + AC_SUBST([osc_monitoring_portals4_CPPFLAGS]) + AC_SUBST([osc_monitoring_portals4_LDFLAGS]) + AC_SUBST([osc_monitoring_portals4_LIBS]) ])dnl From cba8b7f56665eb42fdc83f20097df1f3e2fabf65 Mon Sep 17 00:00:00 2001 From: Todd Kordenbrock Date: Tue, 21 Nov 2017 09:14:35 -0600 Subject: [PATCH 2/2] configury: remove export of unused LDFLAGS and LIBS Signed-off-by: Todd Kordenbrock --- ompi/mca/osc/monitoring/configure.m4 | 2 -- 1 file changed, 2 deletions(-) diff --git a/ompi/mca/osc/monitoring/configure.m4 b/ompi/mca/osc/monitoring/configure.m4 index b8670099f37..ca4e89c615b 100644 --- a/ompi/mca/osc/monitoring/configure.m4 +++ b/ompi/mca/osc/monitoring/configure.m4 @@ -21,6 +21,4 @@ AC_DEFUN([MCA_ompi_osc_monitoring_CONFIG],[ []) # substitute in the things needed to build portals4 AC_SUBST([osc_monitoring_portals4_CPPFLAGS]) - AC_SUBST([osc_monitoring_portals4_LDFLAGS]) - AC_SUBST([osc_monitoring_portals4_LIBS]) ])dnl