diff options
author | Mike McGreevy <mamcgree@hdfgroup.org> | 2007-03-08 16:57:36 (GMT) |
---|---|---|
committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2007-03-08 16:57:36 (GMT) |
commit | 2996c917afa9d8dc27ac0360d6e34cd637a513f6 (patch) | |
tree | 8c0676b2cf0db0b99cb229a411b25a540c8e38c9 /configure | |
parent | 5a4bf8171df9473047d1eda534ed9a6a4d0749d9 (diff) | |
download | hdf5-2996c917afa9d8dc27ac0360d6e34cd637a513f6.zip hdf5-2996c917afa9d8dc27ac0360d6e34cd637a513f6.tar.gz hdf5-2996c917afa9d8dc27ac0360d6e34cd637a513f6.tar.bz2 |
[svn-r13475] There's a configure issue linking szip's shared libraries when running on kagiso.
The static szip libraries are working as intended, but when shared szip
libraries are present and intended for use they cannot be opened. A check
has been implemented to test if shared szip libraries are functional on
current platform. If they are not, and the user is trying to use them,
szip is now disbaled and the user is informed.
This issue occurs on kagiso, and the resolution was tested on kagiso.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 101 |
1 files changed, 88 insertions, 13 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 13355 2007-02-20 21:31:14Z acheng . +# From configure.in Id: configure.in 13432 2007-02-28 17:54:50Z slu . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.60 for HDF5 1.8.0-alpha6snap2. # @@ -50478,15 +50478,70 @@ echo "$as_me: error: couldn't find szlib library" >&2;} esac if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then + { echo "$as_me:$LINENO: checking for szlib encoder" >&5 +echo $ECHO_N "checking for szlib encoder... $ECHO_C" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_FILTER_SZIP 1 + if test "${hdf5_cv_szlib_functional+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - USE_FILTER_SZIP="yes" + #include <szlib.h> + + int main(void) + { + SZ_encoder_enabled(); + exit(0); + } + +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + hdf5_cv_szlib_functional=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +hdf5_cv_szlib_functional=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + +fi - { echo "$as_me:$LINENO: checking for szlib encoder" >&5 -echo $ECHO_N "checking for szlib encoder... $ECHO_C" >&6; } if test "${hdf5_cv_szlib_can_encode+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -50553,23 +50608,43 @@ fi fi + if test ${hdf5_cv_szlib_functional} = "no"; then + hdf5_cv_szlib_can_encode=broken + else + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FILTER_SZIP 1 +_ACEOF + + USE_FILTER_SZIP="yes" + fi + if test ${hdf5_cv_szlib_can_encode} = "yes"; then { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - else + fi + if test ${hdf5_cv_szlib_can_encode} = "no"; then { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi + if test ${hdf5_cv_szlib_can_encode} = "broken"; then + { echo "$as_me:$LINENO: result: shared szlib doesn't work. disabling szip." >&5 +echo "${ECHO_T}shared szlib doesn't work. disabling szip." >&6; } + fi + if test ${hdf5_cv_szlib_can_encode} = "yes"; then if test "X$EXTERNAL_FILTERS" != "X"; then - EXTERNAL_FILTERS="${EXTERNAL_FILTERS}," + EXTERNAL_FILTERS="${EXTERNAL_FILTERS}," + fi + EXTERNAL_FILTERS="${EXTERNAL_FILTERS}szip(encoder)" 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)" + if test ${hdf5_cv_szlib_can_encode} = "no"; then + if test "X$EXTERNAL_FILTERS" != "X"; then + EXTERNAL_FILTERS="${EXTERNAL_FILTERS}," + fi + EXTERNAL_FILTERS="${EXTERNAL_FILTERS}szip(no encoder)" fi + fi cat >confcache <<\_ACEOF |