Skip to content

Commit be1177b

Browse files
committed
Always try for HDF5 if it's required of us
It's somewhat unlikely that users will have it in their existing paths but it's not impossible.
1 parent c0cf044 commit be1177b

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

m4/hdf5.m4

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ AC_DEFUN([CONFIGURE_HDF5],
3333
[AC_MSG_ERROR(bad value ${enableval} for --enable-hdf5-required)])],
3434
[hdf5required=no])
3535
36-
3736
AS_IF([test "x$enablehdf5" = "xyes"],
3837
[
3938
AX_PATH_HDF5(1.8.0,$hdf5required)
@@ -120,6 +119,14 @@ dnl expands to the string in 'equal', otherwise to the string in
120119
dnl 'not-equal'.
121120
is_package_required=ifelse([$2], ,no, $2)
122121
122+
dnl If we're told that HDF5 is required, but we weren't told where to
123+
dnl look for it, let's hope it's in the compiler paths already: we'll
124+
dnl set with_hdf5=yes so that we have a chance to auto-detect it and
125+
dnl so that we hit the code paths where we scream if we don't detect
126+
dnl it (or detect too old a version of it).
127+
AS_IF([test "x$is_package_required" = "xyes"],
128+
[with_hdf5=yes])
129+
123130
AS_IF([test "x${with_hdf5}" != "xno"],
124131
[
125132
AS_IF([test -d "${HDF5_PREFIX}/lib"],

0 commit comments

Comments
 (0)