diff --git a/CMakeLists.txt b/CMakeLists.txt index a47930005b5..a01e215b35b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -301,7 +301,6 @@ SET(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BU is_disabled(BUILD_SHARED_LIBS enable_static) is_enabled(BUILD_SHARED_LIBS enable_shared) -is_enabled(ENABLE_NETCDF_4 HAS_NC4) is_enabled(USE_SZIP HAS_SZIP) is_enabled(USE_SZIP HAS_SZIP_WRITE) is_enabled(STATUS_PNETCDF HAS_PNETCDF) diff --git a/configure.ac b/configure.ac index dd92a1a4403..f8fa8dbd1af 100644 --- a/configure.ac +++ b/configure.ac @@ -238,6 +238,20 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include "netcdf_meta.h"], #endif] ])], [have_netcdf_par=yes], [have_netcdf_par=no]) +# Do we have szip? +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include "netcdf_meta.h"], +[[#if !NC_HAS_SZIP_WRITE +# error +#endif] +])], [have_szip_write=yes], [have_szip_write=no]) + +# Do we have parallel filter support? +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include "netcdf_meta.h"], +[[#if !NC_HAS_PAR_FILTERS +# error +#endif] +])], [have_par_filters=yes], [have_par_filters=no]) + AC_MSG_CHECKING([whether netCDF provides parallel IO]) AC_MSG_RESULT([${have_netcdf_par}]) if test x$have_netcdf_par = xyes; then @@ -350,12 +364,10 @@ AC_SUBST([LDFLAGS]) AC_SUBST([AM_CFLAGS]) AC_SUBST([AM_CPPFLAGS]) AC_SUBST([AM_LDFLAGS]) -AC_SUBST(HAS_NC4,[$enable_netcdf_4]) AC_SUBST(HAS_PNETCDF,[$enable_pnetcdf]) AC_SUBST(HAS_LOGGING, [$enable_logging]) -AC_SUBST(HAS_SZIP,[$enable_szlib]) -AC_SUBST(HAS_SZIP_WRITE, [$enable_szlib]) -AC_SUBST([HAS_PAR_FILTERS], [$hdf5_supports_par_filters]) +AC_SUBST(HAS_SZIP_WRITE, [$have_szip_write]) +AC_SUBST([HAS_PAR_FILTERS], [$have_par_filters]) # Create the build summary file. AC_CONFIG_FILES([libpio.settings]) diff --git a/libpio.settings.in b/libpio.settings.in index df5d14bb256..88e735e2324 100644 --- a/libpio.settings.in +++ b/libpio.settings.in @@ -24,9 +24,7 @@ Extra libraries: @LIBS@ # Features -------- -NetCDF-4 API: @HAS_NC4@ PnetCDF Support: @HAS_PNETCDF@ -SZIP Support: @HAS_SZIP@ SZIP Write Support: @HAS_SZIP_WRITE@ Parallel Filters: @HAS_PAR_FILTERS@