diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-07-30 23:15:09 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-07-30 23:15:09 (GMT) |
| commit | 0bb87534a6a78d5a5bddd84b9aa4867826368d8b (patch) | |
| tree | 830d41498d87478ea8cc22e2f6e36011008e8c6e /configure.ac | |
| parent | 3e91eeb270efaa2075c80e81895066bccf1b1a47 (diff) | |
| parent | 88aa0d5c76545eabf08be069a684fd7328eb4185 (diff) | |
| download | hdf5-0bb87534a6a78d5a5bddd84b9aa4867826368d8b.zip hdf5-0bb87534a6a78d5a5bddd84b9aa4867826368d8b.tar.gz hdf5-0bb87534a6a78d5a5bddd84b9aa4867826368d8b.tar.bz2 | |
Merge remote-tracking branch 'hdffv/develop' into rebased-fprintf-experiment
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index e46475d..a239cd3 100644 --- a/configure.ac +++ b/configure.ac @@ -1250,12 +1250,6 @@ case "$host_cpu-$host_vendor-$host_os" in H5_CPPFLAGS="-D_GNU_SOURCE $H5_CPPFLAGS" ;; - *solaris*) - ## Solaris also needs _POSIX_C_SOURCE set correctly to pick up - ## clock_gettime(). - H5_CPPFLAGS="-D_POSIX_C_SOURCE=200112L $H5_CPPFLAGS" - H5_CPPFLAGS="-D_GNU_SOURCE $H5_CPPFLAGS" - ;; esac ## Need to add the AM_ and H5_ into CFLAGS/CPPFLAGS to make them visible @@ -1611,7 +1605,10 @@ case "X-$withval" in if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, - [LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_SZLIB]) + [CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"; LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_SZLIB]) + if test -z "$HAVE_SZLIB"; then + AC_MSG_RESULT([Using SZ_BufftoBuffCompress from libsz in $szlib_lib failed. Szip not enabled.]) + fi fi if test -z "$HAVE_SZLIB" -a -n "$HDF5_CONFIG_ABORT"; then |