From 07ec4721906ec75e9f12f506e0fb9011fdaa87e3 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Tue, 22 Aug 2023 17:34:48 -0700 Subject: [PATCH 1/2] Enable szip by default in Autotools Since libaec is so prevalent and BSD-licensed for both encode and decode, we build the szip filter by default when the szip or aec libraries are found. --- configure.ac | 9 +++++++-- release_docs/RELEASE.txt | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index d669beae84b..231ea888708 100644 --- a/configure.ac +++ b/configure.ac @@ -1561,7 +1561,7 @@ AC_ARG_WITH([fnord], ## ---------------------------------------------------------------------- ## Make the external filters list available to *.in files ## At this point it's unset (no external filters by default) but it -## will be filled in during the deflate (zlib) and szip processing +## will be filled in during the deflate/zlib and szip/libaec processing ## below. ## AC_SUBST([EXTERNAL_FILTERS]) @@ -1666,13 +1666,18 @@ fi ## command-line switch. The value is an include path and/or a library path. ## If the library path is specified then it must be preceded by a comma. ## +## libaec also implements Space Data System Standard 121.0-B-2 and has +## an szip compatibility header. Since the AEC library is BSD licensed +## for both encoding and decoding, we now build with the filter enabled +## by default when the library is found. +## AC_SUBST([LL_PATH]) AC_SUBST([USE_FILTER_SZIP]) USE_FILTER_SZIP="no" AC_ARG_WITH([szlib], [AS_HELP_STRING([--with-szlib=DIR], [Use szlib library for external szlib I/O filter [default=no]])],, - [withval=no]) + [withval=yes]) case "X-$withval" in X-yes) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 77a0d8b7568..bef7c96a5d0 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -47,6 +47,12 @@ New Features Configuration: ------------- + - Autotools builds now build the szip filter by default when an appropriate + library is found + + Since libaec is prevalent and BSD-licensed for both encoding and + decoding, we build the szip filter by default now. + - Removed CMake cross-compiling variables * HDF5_USE_PREGEN From e29df3f280c4b8ac099637b7b64ffd735a3d45e1 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Tue, 22 Aug 2023 17:37:17 -0700 Subject: [PATCH 2/2] Fix szip help string in configure Forgot to switch the default in the help text. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 231ea888708..c0eb47cb8b8 100644 --- a/configure.ac +++ b/configure.ac @@ -1676,7 +1676,7 @@ AC_SUBST([USE_FILTER_SZIP]) USE_FILTER_SZIP="no" AC_ARG_WITH([szlib], [AS_HELP_STRING([--with-szlib=DIR], [Use szlib library for external szlib I/O - filter [default=no]])],, + filter [default=yes]])],, [withval=yes]) case "X-$withval" in