Skip to content

Commit a2aae17

Browse files
authored
Merge pull request #9928 from awlauria/fix_no_ompio_option
Fix --disable-ompio builds.
2 parents 2328930 + cdd2067 commit a2aae17

File tree

5 files changed

+32
-7
lines changed

5 files changed

+32
-7
lines changed

config/ompi_configure_options.m4

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,18 @@ AC_DEFINE_UNQUOTED(MPI_PARAM_CHECK, $mpi_param_check,
231231
AC_DEFINE_UNQUOTED(OMPI_PARAM_CHECK, $ompi_param_check,
232232
[Whether we want to check MPI parameters never or possible (an integer constant)])
233233

234+
AC_MSG_CHECKING([if want ompio support])
234235
AC_ARG_ENABLE([io-ompio],
235236
[AS_HELP_STRING([--disable-io-ompio],
236237
[Disable the ompio MPI-IO component])])
238+
if test "$enable_io_ompio" = "no" ; then
239+
AC_MSG_RESULT([no])
240+
ompi_want_ompio=0
241+
else
242+
AC_MSG_RESULT([yes])
243+
ompi_want_ompio=1
244+
fi
245+
AM_CONDITIONAL(OMPI_OMPIO_SUPPORT, test "$ompi_want_ompio" = "1")
237246

238247
])dnl
239248

ompi/mca/fbtl/base/Makefile.am

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ headers += \
2222

2323
libmca_fbtl_la_SOURCES += \
2424
base/fbtl_base_frame.c \
25-
base/fbtl_base_file_select.c \
26-
base/fbtl_base_file_unselect.c \
2725
base/fbtl_base_find_available.c
26+
27+
if OMPI_OMPIO_SUPPORT
28+
libmca_fbtl_la_SOURCES += \
29+
base/fbtl_base_file_select.c \
30+
base/fbtl_base_file_unselect.c
31+
endif

ompi/mca/fcoll/base/Makefile.am

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@ headers += \
2323

2424
libmca_fcoll_la_SOURCES += \
2525
base/fcoll_base_frame.c \
26+
base/fcoll_base_find_available.c
27+
28+
if OMPI_OMPIO_SUPPORT
29+
libmca_fcoll_la_SOURCES += \
2630
base/fcoll_base_file_select.c \
2731
base/fcoll_base_file_unselect.c \
28-
base/fcoll_base_find_available.c \
2932
base/fcoll_base_sort.c \
3033
base/fcoll_base_file_read_all.c \
3134
base/fcoll_base_coll_array.c
35+
endif

ompi/mca/fs/base/Makefile.am

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,16 @@ headers += \
2222

2323
libmca_fs_la_SOURCES += \
2424
base/fs_base_frame.c \
25+
base/fs_base_find_available.c
26+
27+
if OMPI_OMPIO_SUPPORT
28+
libmca_fs_la_SOURCES += \
2529
base/fs_base_file_select.c \
2630
base/fs_base_file_unselect.c \
27-
base/fs_base_find_available.c \
2831
base/fs_base_get_parent_dir.c \
2932
base/fs_base_file_close.c \
3033
base/fs_base_file_sync.c \
3134
base/fs_base_file_delete.c \
3235
base/fs_base_file_set_size.c \
3336
base/fs_base_file_get_size.c
37+
endif

ompi/mca/sharedfp/base/Makefile.am

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@
2121
headers += \
2222
base/base.h
2323

24+
libmca_sharedfp_la_SOURCES += \
25+
base/sharedfp_base_frame.c \
26+
base/sharedfp_base_find_available.c
27+
28+
if OMPI_OMPIO_SUPPORT
2429
libmca_sharedfp_la_SOURCES += \
2530
base/sharedfp_base_file_select.c \
26-
base/sharedfp_base_file_unselect.c \
27-
base/sharedfp_base_find_available.c \
28-
base/sharedfp_base_frame.c
31+
base/sharedfp_base_file_unselect.c
32+
endif

0 commit comments

Comments
 (0)