Skip to content

Commit 0a47d29

Browse files
committed
regx/fwd: make the module static
and enable test/util/orte_nidmap Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent 64ba33c commit 0a47d29

File tree

2 files changed

+38
-7
lines changed

2 files changed

+38
-7
lines changed

orte/mca/regx/fwd/configure.m4

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# -*- shell-script -*-
2+
#
3+
# Copyright (c) 2018 Research Organization for Information Science
4+
# and Technology (RIST). All rights reserved.
5+
# $COPYRIGHT$
6+
#
7+
# Additional copyrights may follow
8+
#
9+
# $HEADER$
10+
#
11+
12+
# MCA_patcher_overwrite_CONFIG(action-if-can-compile,
13+
# [action-if-cant-compile])
14+
# ------------------------------------------------
15+
AC_DEFUN([MCA_orte_regx_fwd_CONFIG],[
16+
AC_CONFIG_FILES([orte/mca/regx/fwd/Makefile])
17+
[$1]
18+
])
19+
20+
#
21+
# Force this component to compile in static-only mode
22+
#
23+
AC_DEFUN([MCA_orte_regx_fwd_COMPILE_MODE],[
24+
AC_MSG_CHECKING([for MCA component $2:$3 compile mode])
25+
$4="static"
26+
AC_MSG_RESULT([$$4])
27+
])

test/util/Makefile.am

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,19 @@ AM_CPPFLAGS = -I$(top_srcdir)/test/support
3232
# opal_os_create_dirpath \
3333
# opal_argv \
3434
# opal_basename \
35-
# opal_path_nfs \
36-
# orte_nidmap
35+
# opal_path_nfs
3736

3837

3938
check_PROGRAMS = \
4039
opal_bit_ops \
4140
opal_path_nfs \
4241
bipartite_graph
4342

43+
if PROJECT_ORTE
44+
check_PROGRAMS += \
45+
orte_nidmap
46+
endif
47+
4448
TESTS = \
4549
$(check_PROGRAMS)
4650

@@ -122,11 +126,11 @@ opal_path_nfs_DEPENDENCIES = $(opal_path_nfs_LDADD)
122126
# $(top_builddir)/test/support/libsupport.a
123127
#orte_universe_setup_file_io_DEPENDENCIES = $(orte_universe_setup_file_io_LDADD)
124128

125-
#orte_nidmap_SOURCES = orte_nidmap.c
126-
#orte_nidmap_LDADD = \
127-
# $(top_builddir)/orte/libopen-rte.la \
128-
# $(top_builddir)/test/support/libsupport.a
129-
#orte_nidmap_DEPENDENCIES = $(orte_nidmap_LDADD)
129+
orte_nidmap_SOURCES = orte_nidmap.c
130+
orte_nidmap_LDADD = \
131+
$(top_builddir)/orte/libopen-rte.la \
132+
$(top_builddir)/test/support/libsupport.a
133+
orte_nidmap_DEPENDENCIES = $(orte_nidmap_LDADD)
130134

131135
bipartite_graph_SOURCES = bipartite_graph.c
132136
bipartite_graph_LDADD = \

0 commit comments

Comments
 (0)