diff options
author | Robert E. McGrath <mcgrath@ncsa.uiuc.edu> | 2004-11-02 19:10:24 (GMT) |
---|---|---|
committer | Robert E. McGrath <mcgrath@ncsa.uiuc.edu> | 2004-11-02 19:10:24 (GMT) |
commit | f7c4277bbbbe531ba37b36bb6b2e1b3f2966efea (patch) | |
tree | 1009412864e2631092c511506477c2b30671bcbe /configure | |
parent | c9874681a6b5056598a5170faecad9b29640fbba (diff) | |
download | hdf5-f7c4277bbbbe531ba37b36bb6b2e1b3f2966efea.zip hdf5-f7c4277bbbbe531ba37b36bb6b2e1b3f2966efea.tar.gz hdf5-f7c4277bbbbe531ba37b36bb6b2e1b3f2966efea.tar.bz2 |
[svn-r9493] Purpose:
Fix SZIP filter to dynmically detect encoder.
Description:
Solution:
See:
http://hdf.ncsa.uiuc.edu/RFC/SZIP/Szip_dynamic_12_Oct.pdf
Platforms tested:
verbena, arabica, cobalt.
Note RE testing:
All automatic tests work as before.
The feature is a configuration thing, so the tests are manual.
Tested with the following configs:
pre-release version of SZIP, with dynamic library,
1. no SZIP
2. SZIP, decoder only
3. SZIP, encoder+decoder
released (static lib) SZIP
4. no SZIP
5. SZIP, decoder only
6. SZIP, encoder+decoder
after build, switch szip in LD_LIBRARY_PATH at run time
7. SZIP decoder
8. SZIP encoder
Misc. update:
Manifest updated
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -24786,7 +24786,6 @@ fi USE_FILTER_SZIP="no" - USE_FILTER_SZIP_ENCODER="no" # Check whether --with-szlib or --without-szlib was given. if test "${with_szlib+set}" = set; then @@ -25280,14 +25279,8 @@ fi if test ${hdf5_cv_szlib_can_encode} = "yes"; then - -cat >>confdefs.h <<\_ACEOF -#define SZIP_CAN_ENCODE 1 -_ACEOF - echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - USE_FILTER_SZIP_ENCODER="yes" else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 @@ -25297,6 +25290,11 @@ echo "${ECHO_T}no" >&6 EXTERNAL_FILTERS="${EXTERNAL_FILTERS}," fi EXTERNAL_FILTERS="${EXTERNAL_FILTERS}szip" + if test ${hdf5_cv_szlib_can_encode} = "yes"; then + EXTERNAL_FILTERS="${EXTERNAL_FILTERS}(encoder)" + else + EXTERNAL_FILTERS="${EXTERNAL_FILTERS}(no encoder)" + fi fi PABLO="" @@ -34661,7 +34659,6 @@ s,@AR@,$AR,;t t s,@DEPEND@,,;t t s,@USE_FILTER_DEFLATE@,$USE_FILTER_DEFLATE,;t t s,@USE_FILTER_SZIP@,$USE_FILTER_SZIP,;t t -s,@USE_FILTER_SZIP_ENCODER@,$USE_FILTER_SZIP_ENCODER,;t t s,@PABLO@,$PABLO,;t t s,@HAVE_PABLO@,$HAVE_PABLO,;t t s,@SSL@,$SSL,;t t |