diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-08-16 23:41:13 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-08-17 12:15:52 (GMT) |
| commit | 62e054435fb49a0a735fa429ffe10134b43db849 (patch) | |
| tree | f5494fe0dba56ec3b7755d73b9579513cb52da26 /configure.ac | |
| parent | e4e823f02ab18e0e17a18df703bf7faef5d4504f (diff) | |
| download | hdf5-62e054435fb49a0a735fa429ffe10134b43db849.zip hdf5-62e054435fb49a0a735fa429ffe10134b43db849.tar.gz hdf5-62e054435fb49a0a735fa429ffe10134b43db849.tar.bz2 | |
1. HDFFV-10830 part 2, move AC_CHECK_HEADERS([szlib.h] after
AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress] to avoid compiling
H5Z.c with szlib.h after its path is removed from AM_CPPFLAGS.
2. Remove unnecessary links to ${HDF5_TOOLS_LIB_TARGET} in
utils/mirror_vfd/CMakeLists.txt that prevent building HDF5 with tools
disabled.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index d982e94..e7aa159 100644 --- a/configure.ac +++ b/configure.ac @@ -1592,19 +1592,19 @@ case "X-$withval" in AM_CPPFLAGS="$AM_CPPFLAGS -I$szlib_inc" fi - AC_CHECK_HEADERS([szlib.h], - [HAVE_SZLIB_H="yes"], - [CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"] [unset HAVE_SZLIB]) - if test -n "$szlib_lib"; then LDFLAGS="$LDFLAGS -L$szlib_lib" AM_LDFLAGS="$AM_LDFLAGS -L$szlib_lib" fi - if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then + if test "x$HAVE_SZLIB" = "xyes"; then AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [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 + if test -n "$HAVE_SZLIB"; then + AC_CHECK_HEADERS([szlib.h], + [HAVE_SZLIB_H="yes"], + [CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"] [unset HAVE_SZLIB]) + else AC_MSG_RESULT([Using SZ_BufftoBuffCompress from libsz in $szlib_lib failed. Szip not enabled.]) fi fi |