summaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2008-10-24 17:19:34 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2008-10-24 17:19:34 (GMT)
commita66427462495807c39be4eb48d7015253b9e8853 (patch)
tree917da048f0d071652d31232d4ede3a82c01df7af /configure.in
parent220c8585e1af4bcff9595ff1506ad90b8c4a4736 (diff)
downloadhdf5-a66427462495807c39be4eb48d7015253b9e8853.zip
hdf5-a66427462495807c39be4eb48d7015253b9e8853.tar.gz
hdf5-a66427462495807c39be4eb48d7015253b9e8853.tar.bz2
[svn-r15942] Purpose: Bug Fixes and Libtool Upgrade
Description: - Remove need to set LD_LIBRARY_PATH when using shared szip library. - Libtool 2.2.6a is now used to generate libraries. - 'make check install' dependency bug is fixed, and should no longer break the build. - removed hard coding of shell in config/commence.am, as this causes problems on Solaris with the new version of libtool. - RELEASE.txt with appropriate changes. Tested: - kagiso, smirom, linew (merged from 1.8, pretty quick tests)
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in32
1 files changed, 11 insertions, 21 deletions
diff --git a/configure.in b/configure.in
index 11319c9..d5abc9f 100644
--- a/configure.in
+++ b/configure.in
@@ -1672,17 +1672,12 @@ esac
if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
dnl SZLIB library is available. Check if it can encode
AC_MSG_CHECKING([for szlib encoder])
-
- AC_CACHE_VAL([hdf5_cv_szlib_functional],
- [AC_TRY_RUN([
- #include <szlib.h>
-
- int main(void)
- {
- SZ_encoder_enabled();
- exit(0);
- }
- ], [hdf5_cv_szlib_functional=yes], [hdf5_cv_szlib_functional=no],)])
+
+ dnl Set LD_LIBRARY_PATH so encoder test can find the library and run.
+ dnl Also add LL_PATH substitution to Makefiles so they can use the
+ dnl path as well, for testing examples.
+ export LD_LIBRARY_PATH="$szlib_lib"
+ AC_SUBST([LL_PATH]) LL_PATH="$szlib_lib"
AC_CACHE_VAL([hdf5_cv_szlib_can_encode],
[AC_TRY_RUN([
@@ -1698,13 +1693,9 @@ if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
}
], [hdf5_cv_szlib_can_encode=yes], [hdf5_cv_szlib_can_encode=no],)])
- if test ${hdf5_cv_szlib_functional} = "no"; then
- hdf5_cv_szlib_can_encode=broken
- else
- AC_DEFINE(HAVE_FILTER_SZIP, 1,
- [Define if support for szip filter is enabled])
- USE_FILTER_SZIP="yes"
- fi
+ AC_DEFINE(HAVE_FILTER_SZIP, 1,
+ [Define if support for szip filter is enabled])
+ USE_FILTER_SZIP="yes"
if test ${hdf5_cv_szlib_can_encode} = "yes"; then
AC_MSG_RESULT([yes])
@@ -1712,9 +1703,6 @@ if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
if test ${hdf5_cv_szlib_can_encode} = "no"; then
AC_MSG_RESULT([no])
fi
- if test ${hdf5_cv_szlib_can_encode} = "broken"; then
- AC_MSG_RESULT([shared szlib doesn't work. disabling szip.])
- fi
dnl Add "szip" to external filter list
if test ${hdf5_cv_szlib_can_encode} = "yes"; then
@@ -1732,6 +1720,8 @@ if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
fi
+AM_CONDITIONAL([BUILD_SZIP_CONDITIONAL], [test "X$USE_FILTER_SZIP" = "Xyes"])
+
dnl Checkpoint the cache
AC_CACHE_SAVE