Skip to content

Commit 64bff0e

Browse files
committed
Disable monitoring if we compile statically.
Protect all components against compilation on static builds. Signed-off-by: George Bosilca <[email protected]>
1 parent 458ccc1 commit 64bff0e

File tree

4 files changed

+58
-6
lines changed

4 files changed

+58
-6
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# -*- shell-script -*-
2+
#
3+
# Copyright (c) 2017 The University of Tennessee and The University
4+
# of Tennessee Research Foundation. All rights
5+
# reserved.
6+
# $COPYRIGHT$
7+
#
8+
# Additional copyrights may follow
9+
#
10+
# $HEADER$
11+
#
12+
13+
# MCA_ompi_coll_monitoring_CONFIG([action-if-can-compile],
14+
# [action-if-cant-compile])
15+
# ------------------------------------------------
16+
AC_DEFUN([MCA_ompi_coll_monitoring_CONFIG],[
17+
AC_CONFIG_FILES([ompi/mca/coll/monitoring/Makefile])
18+
19+
AS_IF([test MCA_BUILD_ompi_common_monitoring_DSO_TRUE == ''],
20+
[$1],
21+
[$2])
22+
])dnl
23+

ompi/mca/common/monitoring/configure.m4

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,7 @@ AC_DEFUN([MCA_ompi_common_monitoring_CONFIG],[
2222
aggregate_profile.pl:test/monitoring/aggregate_profile.pl)])])
2323

2424

25-
[$1]
25+
AS_IF([test MCA_BUILD_ompi_common_monitoring_DSO_TRUE == ''],
26+
[$1],
27+
[$2])
2628
])dnl

ompi/mca/osc/monitoring/configure.m4

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@
1111
# MCA_ompi_osc_monitoring_CONFIG()
1212
# ------------------------------------------------
1313
AC_DEFUN([MCA_ompi_osc_monitoring_CONFIG],[
14-
AC_CONFIG_FILES([ompi/mca/osc/monitoring/Makefile])
14+
AC_CONFIG_FILES([ompi/mca/osc/monitoring/Makefile])
1515

16-
OPAL_CHECK_PORTALS4([osc_monitoring],
17-
[AC_DEFINE([OMPI_WITH_OSC_PORTALS4], [1], [Whether or not to generate template for osc_portals4])],
18-
[])
19-
])dnl
16+
AS_IF([test MCA_BUILD_ompi_common_monitoring_DSO_TRUE == ''],
17+
[$1],
18+
[$2])
19+
OPAL_CHECK_PORTALS4([osc_monitoring],
20+
[AC_DEFINE([OMPI_WITH_OSC_PORTALS4], [1], [Whether or not to generate template for osc_portals4])],
21+
[])
22+
])dnl
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# -*- shell-script -*-
2+
#
3+
# Copyright (c) 2017 The University of Tennessee and The University
4+
# of Tennessee Research Foundation. All rights
5+
# reserved.
6+
# $COPYRIGHT$
7+
#
8+
# Additional copyrights may follow
9+
#
10+
# $HEADER$
11+
#
12+
13+
# MCA_ompi_coll_monitoring_CONFIG([action-if-can-compile],
14+
# [action-if-cant-compile])
15+
# ------------------------------------------------
16+
AC_DEFUN([MCA_ompi_pml_monitoring_CONFIG],[
17+
AC_CONFIG_FILES([ompi/mca/pml/monitoring/Makefile])
18+
19+
AS_IF([test MCA_BUILD_ompi_common_monitoring_DSO_TRUE == ''],
20+
[$1],
21+
[$2])
22+
])dnl
23+
24+

0 commit comments

Comments
 (0)