summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2020-07-14 17:59:26 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2020-07-14 17:59:26 (GMT)
commit1ecb6ec9c5075a97572d06a1f509cd763be2bc94 (patch)
treeba79592622bb4b9a46e6bdb3beccbc7cdc99d042
parentf643e090a398dbe3140dbd7b51f31b8c3f2111df (diff)
parentfe18e4fd13bdc6433f46b8f35d6057acb306b824 (diff)
downloadhdf5-1ecb6ec9c5075a97572d06a1f509cd763be2bc94.zip
hdf5-1ecb6ec9c5075a97572d06a1f509cd763be2bc94.tar.gz
hdf5-1ecb6ec9c5075a97572d06a1f509cd763be2bc94.tar.bz2
Merge pull request #2690 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit 'fe18e4fd13bdc6433f46b8f35d6057acb306b824': Merge pull request #2686 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
-rw-r--r--configure.ac5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 632906f..0221863 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1603,7 +1603,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