Autotools fixes

BLOSC2/config/CacheURLs.cmake

@@ -17,7 +17,7 @@
 
 set (HDF5_BLOSC2_VERSION "2.17.1" CACHE INTERNAL "Version of Blosc2 to use when building from external source")
 set (BLOSC2_GIT_URL "https://github.com/Blosc/c-blosc2.git" CACHE STRING "Use BLOSC2 from Github" FORCE)
-set (BLOSC2_GIT_BRANCH "main" CACHE STRING "" FORCE)
+set (BLOSC2_GIT_BRANCH "v${HDF5_BLOSC2_VERSION}" CACHE STRING "" FORCE)
 
 set (BLOSC2_TGZ_ORIGPATH "https://github.com/Blosc/c-blosc2/archive/refs/tags" CACHE STRING "Use PLUGINS from original location" FORCE)
 set (BLOSC2_TGZ_NAME "c-blosc2-${HDF5_BLOSC2_VERSION}.tar.gz" CACHE STRING "Use BLOSC2 from compressed file" FORCE)

BLOSC2/config/cmake/H5BLOSC2Macros.cmake

@@ -35,8 +35,13 @@ macro (EXTERNAL_BLOSC2_LIBRARY compress_type)
   set (BUILD_PLUGINS OFF CACHE BOOL "" FORCE)
   set (BLOSC_IS_SUBPROJECT ON CACHE BOOL "" FORCE)
   set (BLOSC_INSTALL OFF CACHE BOOL "" FORCE)
+  # Prevent blosc2's transitive deps (zlib-ng, lz4) from building as shared DLLs.
+  set (SAVED_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+  set (BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
 
   FetchContent_MakeAvailable(BLOSC2)
+
+  set (BUILD_SHARED_LIBS ${SAVED_BUILD_SHARED_LIBS} CACHE BOOL "" FORCE)
   if (WIN32 AND CMAKE_C_COMPILER_ID MATCHES "IntelLLVM")
     target_compile_options(blosc2_static PRIVATE -Wno-implicit-function-declaration)
   endif ()

BZIP2/configure.ac

@@ -7,9 +7,9 @@
 # Allen Byrne, Ed Hartnett 1/14/19
 
 # Initialize autoconf.
-AC_PREREQ(2.59)
-AC_INIT(H5BZ2, 1.0, help@hdfgroup.org)
-AC_CONFIG_HEADER([bzip_config.h])
+AC_PREREQ([2.71])
+AC_INIT([H5BZ2],[1.0],[help@hdfgroup.org])
+AC_CONFIG_HEADERS([bzip_config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 # Initialize automake.
@@ -23,17 +23,17 @@ AC_PROG_INSTALL
 # Initialize libtool, checking for dlopen.
 LT_INIT(dlopen)
 
-# If the env. variable HDF5_PLUGIN_DIR is set, or if
-# --with-hdf5-plugin-dir=<directory>, use it as a place for the large
+# If the env. variable HDF5_PLUGIN_PATH is set, or if
+# --with-hdf5-plugin-path=<directory>, use it as a place for the large
 # (i.e. > 2 GiB) files created during the large file testing.
 AC_MSG_CHECKING([where to put HDF5 plugins])
-HDF5_PLUGIN_DIR=${HDF5_PLUGIN_DIR-'/usr/local/hdf5/lib/plugin'}
-AC_ARG_WITH([hdf5-plugin-dir],
-            [AS_HELP_STRING([--with-hdf5-plugin-dir=<directory>],
-                            [specify HDF5 plugin directory (defaults to /usr/local/hdf5/lib/plugin, or value of HDF5_PLUGIN_DIR, if set)])],
-            [HDF5_PLUGIN_DIR=$with_hdf5_plugin_dir])
-AC_MSG_RESULT($HDF5_PLUGIN_DIR)
-AC_SUBST([HDF5_PLUGIN_DIR])
+HDF5_PLUGIN_PATH=${HDF5_PLUGIN_PATH-'/usr/local/hdf5/lib/plugin'}
+AC_ARG_WITH([hdf5-plugin-path],
+            [AS_HELP_STRING([--with-hdf5-plugin-path=<directory>],
+                            [specify HDF5 plugin directory (defaults to /usr/local/hdf5/lib/plugin, or value of HDF5_PLUGIN_PATH, if set)])],
+            [HDF5_PLUGIN_PATH=$with_hdf5_plugin_path])
+AC_MSG_RESULT($HDF5_PLUGIN_PATH)
+AC_SUBST([HDF5_PLUGIN_PATH])
 
 # Is the bzip2 library and header present?
 AC_CHECK_HEADERS([bzlib.h], [], [AC_MSG_ERROR([bzlib.h is required, set CPPFLAGS.])])
@@ -46,8 +46,6 @@ AC_CHECK_LIB([m], [floor], [], [AC_MSG_ERROR([Math library is required.])])
 AC_CHECK_HEADERS([hdf5.h], [], [AC_MSG_ERROR([hdf5.h is required, set CPPFLAGS.])])
 AC_SEARCH_LIBS([H5Fflush], [hdf5dll hdf5], [], [AC_MSG_ERROR([libhdf5 is required, set LDFLAGS.])])
 
-# Check for other header files we need.
-AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h stdlib.h string.h])
 
 # Checks for typedefs, structures, and compiler characteristics.

BZIP2/example/Makefile.am

@@ -7,6 +7,13 @@
 # Link to our filter library.
 LDADD = ${top_builddir}/src/libh5bz2.la
 
-# Build example program.
-noinst_PROGRAMS = h5ex_d_bzip2
+# Build example program and run it as a test.
+check_PROGRAMS = h5ex_d_bzip2
+TESTS = run_tests.sh
+
+# Clean up HDF5 file created by example.
+CLEANFILES = *.h5
+
+EXTRA_DIST = run_tests.sh
+
 

BZIP2/example/run_tests.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+# This script runs the BZIP2 examples in the hdf5_plugins project.
+
+# Set the plugin path to find plugin.
+export HDF5_PLUGIN_PATH=../src/.libs
+
+# Run the example.
+./h5ex_d_bzip2