summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2002-11-20 13:02:20 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2002-11-20 13:02:20 (GMT)
commitb1ff513e6acaeb6dc4d3296e99955fcf394ac86a (patch)
treebc003dd7746bbaeec8e859c7314775914a2e6346
parentdd5cc739c1b41418c4ce114522ab7304a5c345bd (diff)
downloadhdf5-b1ff513e6acaeb6dc4d3296e99955fcf394ac86a.zip
hdf5-b1ff513e6acaeb6dc4d3296e99955fcf394ac86a.tar.gz
hdf5-b1ff513e6acaeb6dc4d3296e99955fcf394ac86a.tar.bz2
[svn-r6110] Purpose:
Code cleanup/new feature Description: Removed poorly named H5_HAVE_COMPRESSION flag in favor of H5_HAVE_FILTER_DEFLATE. Added new test files for "missing filter" testing. Platforms tested: Tested h5committest {arabica (fortran), eirene (fortran, C++) modi4 (parallel, fortran)} FreeBSD 4.7 (sleipnir)
-rw-r--r--MANIFEST2
-rwxr-xr-xconfigure7
-rw-r--r--configure.in6
3 files changed, 5 insertions, 10 deletions
diff --git a/MANIFEST b/MANIFEST
index ed82c0c..928e8ba 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -925,6 +925,7 @@
./test/bittests.c
./test/cmpd_dset.c
./test/dsets.c
+./test/deflate.h5
./test/dtypes.c
./test/enum.c
./test/extend.c
@@ -950,6 +951,7 @@
./test/ntypes.c
./test/ohdr.c
./test/space_overflow.c _DO_NOT_DISTRIBUTE_
+./test/gen_deflate.c _DO_NOT_DISTRIBUTE_
./test/gen_old_array.c _DO_NOT_DISTRIBUTE_
./test/gen_new_array.c _DO_NOT_DISTRIBUTE_
./test/gen_new_fill.c _DO_NOT_DISTRIBUTE_
diff --git a/configure b/configure
index 9a6dcd1..f50503b 100755
--- a/configure
+++ b/configure
@@ -23231,12 +23231,7 @@ esac
if test "x$HAVE_ZLIB" = "xyes" -a "x$HAVE_ZLIB_H" = "xyes" -a "x$HAVE_COMPRESS2" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-#define HAVE_COMPRESSION 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FILTER_GZIP 1
+#define HAVE_FILTER_DEFLATE 1
_ACEOF
fi
diff --git a/configure.in b/configure.in
index b6daa27..d49a6c9 100644
--- a/configure.in
+++ b/configure.in
@@ -776,10 +776,8 @@ case $withval in
esac
if test "x$HAVE_ZLIB" = "xyes" -a "x$HAVE_ZLIB_H" = "xyes" -a "x$HAVE_COMPRESS2" = "xyes"; then
- AC_DEFINE(HAVE_COMPRESSION, 1,
- [Define if we have zlib compression support])
- AC_DEFINE(HAVE_FILTER_GZIP, 1,
- [Define if support for gzip filter is enabled])
+ AC_DEFINE(HAVE_FILTER_DEFLATE, 1,
+ [Define if support for deflate filter is enabled])
fi
dnl ----------------------------------------------------------------------