clean up

CMakeLists.txt

@@ -284,11 +284,13 @@ CHECK_C_SOURCE_COMPILES("
 int main() {return 0;}" HAVE_NETCDF4)
 
 ###
-# Check to see if netcdf-4 parallel I/O capability is present in netcdf-c.
+# Check to see if netcdf-4 parallel I/O capability is present in
+# netcdf-c. (Really we should be checking NC_HAS_PARALLEL4, but that
+# was only recently introduced, so we will go with NC_HAS_PARALLEL.)
 ###
 CHECK_C_SOURCE_COMPILES("
 #include <netcdf_meta.h>
-#if !NC_HAS_PARALLEL4
+#if !NC_HAS_PARALLEL
       choke me
 #endif
 int main() {return 0;}" HAVE_NETCDF_PAR)
@@ -305,7 +307,7 @@ CHECK_C_SOURCE_COMPILES("
 int main() {return 0;}" HAVE_SZIP_WRITE)
 
 ###
-# Check to see if paraellel filters are supported by HDF5/netcdf-c.
+# Check to see if parallel filters are supported by HDF5/netcdf-c.
 ###
 CHECK_C_SOURCE_COMPILES("
 #include <netcdf_meta.h>

configure.ac

@@ -266,9 +266,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include "netcdf_meta.h"],
 AC_MSG_CHECKING([whether netCDF provides netCDF/HDF5])
 AC_MSG_RESULT([${have_netcdf4}])
 
-# Do we have a parallel build of netCDF-4?
+# Do we have a parallel build of netCDF-4? (Really we should be
+# checking NC_HAS_PARALLEL4, but that was only recently introduced, so
+# we will go with NC_HAS_PARALLEL.)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include "netcdf_meta.h"],
-[[#if !NC_HAS_PARALLEL4
+[[#if !NC_HAS_PARALLEL
 # error
 #endif]
 ])], [have_netcdf_par=yes], [have_netcdf_par=no])

libpio.settings.in

@@ -27,8 +27,8 @@ FPPFLAGS:               @FPPFLAGS@
 # Features
 --------
 PnetCDF Support:	@HAS_PNETCDF@
-SZIP Write Support:     @HAS_SZIP_WRITE@
-Parallel Filters:       @HAS_PAR_FILTERS@
-NetCDF/HDF5 Support:    @HAS_NETCDF4@
+SZIP Write Support:	@HAS_SZIP_WRITE@
+Parallel Filters:	@HAS_PAR_FILTERS@
+NetCDF/HDF5 Support:	@HAS_NETCDF4@
 NetCDF/HDF5 Par I/O:	@HAS_NETCDF4_PAR@