Skip to content

Commit 9d1801e

Browse files
committed
explicit setting --with-daos automaticall sets --enable-daos-mod
1 parent 833b89d commit 9d1801e

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

darshan-runtime/configure.ac

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -506,16 +506,24 @@ if test "x$enable_darshan_runtime" = xyes ; then
506506
# inform about DAOS installs not found in default locations
507507
AC_ARG_WITH([daos],
508508
[AS_HELP_STRING([--with-daos@<:@=DIR@:>@],
509-
[Installation directory for DAOS.])],
510-
[], [with_daos=no]
509+
[Installation directory for DAOS.])]
511510
)
512511

513512
# DAOS module (disabled by default)
514513
AC_ARG_ENABLE([daos-mod],
515514
[AS_HELP_STRING([--enable-daos-mod],
516-
[Enables compilation and use of DAOS module])],
517-
[], [enable_daos_mod=no]
515+
[Enables compilation and use of DAOS module])]
518516
)
517+
518+
# When --with-daos is set, we automatically enable enable_daos_mod
519+
if test "x$enable_daos_mod" = x ; then
520+
if test "x$with_daos" != x ; then
521+
enable_daos_mod=yes
522+
else
523+
enable_daos_mod=no
524+
fi
525+
fi
526+
519527
if test "x$enable_daos_mod" = xyes ; then
520528
AC_CHECK_HEADERS(m4_normalize([daos_types.h daos_prop.h daos_pool.h daos_cont.h
521529
daos_obj.h daos_array.h daos_fs.h]),

darshan-runtime/doc/darshan-runtime.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,10 @@ Compilation
197197
installation directory for DAOS
198198

199199
.. note::
200-
Users must call ``--enable-daos-mod`` to enable DAOS modules,
201-
``--with-daos`` is only used to additionally provide a DAOS install
202-
prefix.
200+
* When ``--with-daos=DIR`` is set, building DAOS module is automatically
201+
enabled.
202+
* When ``--enable-daos-mod`` is set but not ``--with-daos=DIR``, Darshan
203+
will search for the DAOS installation location available on the system.
203204
* ``--enable-mdhim-mod``: enables compilation and use of Darshan's MDHIM module
204205
(default=disabled)
205206
* ``--enable-ldms-mod``: enables compilation and use of Darshan’s LDMS runtime

0 commit comments

Comments
 (0)