Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable szip by default in Autotools #3412

Merged
merged 2 commits into from
Aug 23, 2023
Merged

Enable szip by default in Autotools #3412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07ec472
Enable szip by default in Autotools
derobins Aug 23, 2023
e29df3f
Fix szip help string in configure
derobins Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down Expand Up @@ -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])
filter [default=yes]])],,
[withval=yes])

case "X-$withval" in
X-yes)
Expand Down
6 changes: 6 additions & 0 deletions release_docs/RELEASE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is true for CMake, but looking at the code in configure.ac and configure I believe that for autotools using a found szip will require a prebuilt libsz. If found it will build it into HDF5, but I don't see that autotools will build it from source.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Autotools can't build libraries from source like CMake

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's what I thought. Perhaps -

Autotools builds now include the szip filter by default when and appropriate library is found.

Since libaec is prevalent and BSD-licensed for both encoding and decoding, the default behavior for both CMake 
and Autotools builds will  include an appropriate and available szip library.  CMake will download and build the 
libaec szip library by default.

Another question - what if HDF5 finds the old szip with license restrictions for encoding?

- Removed CMake cross-compiling variables

* HDF5_USE_PREGEN
Expand Down