Commit 0b434339 authored by Philip Carns's avatar Philip Carns

add configure option for older HDF5 API

- also rename option for newer API
- make the two options mutually exclusive
parent b4569fcb
......@@ -701,7 +701,8 @@ with_log_hints
with_log_path
with_jobid_env
with_mod_mem
enable_HDF5_post_1_10_abi
enable_HDF5_post_1_10
enable_HDF5_pre_1_10
'
ac_precious_vars='build_alias
host_alias
......@@ -1339,8 +1340,10 @@ Optional Features:
--disable-bgq-mod Disables compilation and use of BG/Q module (for BG/Q systems)
--disable-lustre-mod Disables compilation and use of the Lustre module
--enable-mmap-logs Enables ability to mmap I/O data to log file
--enable-HDF5-post-1.10-abi
--enable-HDF5-post-1.10
Enable HDF5 module for HDF5 version 1.10 or later
--enable-HDF5-pre-1.10
Enable HDF5 module for HDF5 version 1.8 or earlier
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
......@@ -4203,12 +4206,28 @@ exec_prefix=$saveExecprefix
BUILD_HDF5_MODULE=
DARSHAN_HDF5_LD_OPTS=
# Check whether --enable-HDF5-post-1.10-abi was given.
if test "${enable_HDF5_post_1_10_abi+set}" = set; then :
enableval=$enable_HDF5_post_1_10_abi; if test "x$enableval" = "xyes" ; then
# see if user explicitly enabled support for an HDF5 API
# Check whether --enable-HDF5-post-1.10 was given.
if test "${enable_HDF5_post_1_10+set}" = set; then :
enableval=$enable_HDF5_post_1_10; if test "x$enableval" = "xyes" ; then
$as_echo "#define __DARSHAN_ENABLE_HDF5110 1" >>confdefs.h
if test "x$BUILD_HDF5_MODULE" = "x1"; then
as_fn_error $? "Cannot set both --enable-HDF5-post-1.10 and --enable-HDF5-pre-1.10" "$LINENO" 5
fi
BUILD_HDF5_MODULE=1
DARSHAN_HDF5_LD_OPTS="${darshan_share_path}/ld-opts/darshan-hdf5-ld-opts"
fi
fi
# Check whether --enable-HDF5-pre-1.10 was given.
if test "${enable_HDF5_pre_1_10+set}" = set; then :
enableval=$enable_HDF5_pre_1_10; if test "x$enableval" = "xyes" ; then
if test "x$BUILD_HDF5_MODULE" = "x1"; then
as_fn_error $? "Cannot set both --enable-HDF5-post-1.10 and --enable-HDF5-pre-1.10" "$LINENO" 5
fi
BUILD_HDF5_MODULE=1
DARSHAN_HDF5_LD_OPTS="${darshan_share_path}/ld-opts/darshan-hdf5-ld-opts"
fi
......
......@@ -258,11 +258,26 @@ exec_prefix=$saveExecprefix
BUILD_HDF5_MODULE=
DARSHAN_HDF5_LD_OPTS=
AC_ARG_ENABLE(HDF5-post-1.10-abi,
[ --enable-HDF5-post-1.10-abi
# see if user explicitly enabled support for an HDF5 API
AC_ARG_ENABLE(HDF5-post-1.10,
[ --enable-HDF5-post-1.10
Enable HDF5 module for HDF5 version 1.10 or later],
[if test "x$enableval" = "xyes" ; then
AC_DEFINE(__DARSHAN_ENABLE_HDF5110, 1, Set for compatibility with HDF5_1.10.x, breaks use with 1.8.x)
AC_DEFINE(__DARSHAN_ENABLE_HDF5110, 1, Set for compatibility with HDF5 1.10.x, breaks use with 1.8.x)
if test "x$BUILD_HDF5_MODULE" = "x1"; then
AC_MSG_ERROR([Cannot set both --enable-HDF5-post-1.10 and --enable-HDF5-pre-1.10])
fi
BUILD_HDF5_MODULE=1
DARSHAN_HDF5_LD_OPTS="${darshan_share_path}/ld-opts/darshan-hdf5-ld-opts"
fi]
,)
AC_ARG_ENABLE(HDF5-pre-1.10,
[ --enable-HDF5-pre-1.10
Enable HDF5 module for HDF5 version 1.8 or earlier],
[if test "x$enableval" = "xyes" ; then
if test "x$BUILD_HDF5_MODULE" = "x1"; then
AC_MSG_ERROR([Cannot set both --enable-HDF5-post-1.10 and --enable-HDF5-pre-1.10])
fi
BUILD_HDF5_MODULE=1
DARSHAN_HDF5_LD_OPTS="${darshan_share_path}/ld-opts/darshan-hdf5-ld-opts"
fi]
......
......@@ -87,7 +87,7 @@
/* Define if cuserid() should be disabled */
#undef __DARSHAN_DISABLE_CUSERID
/* Set for compatibility with HDF5_1.10.x */
/* Set for compatibility with HDF5 1.10.x */
#undef __DARSHAN_ENABLE_HDF5110
/* Define if Darshan should mmap data structures to log file */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment