diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-07-11 13:07:10 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-07-11 13:07:10 (GMT) |
| commit | b480d0a38b1e265c55c74262bf384d255a33e07b (patch) | |
| tree | 55455441e7bfd1a21af5382fd2cb6a41f8b94a4b | |
| parent | e3f5f59a616c268b34e68f5fdbb287305ba1004f (diff) | |
| parent | 800f93f7c994f88dfa716746153ded4b1e690e3a (diff) | |
| download | hdf5-b480d0a38b1e265c55c74262bf384d255a33e07b.zip hdf5-b480d0a38b1e265c55c74262bf384d255a33e07b.tar.gz hdf5-b480d0a38b1e265c55c74262bf384d255a33e07b.tar.bz2 | |
Merge pull request #2686 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '800f93f7c994f88dfa716746153ded4b1e690e3a':
Remove path to szip header file from AM_CPPFLAGS when configure check of libsz fails. Fix for HDFFV-10830.
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e16cbba..670b0eb 100644 --- a/configure.ac +++ b/configure.ac @@ -1611,7 +1611,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 |