summaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2008-10-24 21:30:49 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2008-10-24 21:30:49 (GMT)
commit1c0b6529947b12d85e328726504e2ae49fd199cd (patch)
tree4df94ae535c099383ca18ad32cc33c8969a78507 /configure.in
parent5f16ae281c3c72cccc731b864cea08b8056dd64f (diff)
downloadhdf5-1c0b6529947b12d85e328726504e2ae49fd199cd.zip
hdf5-1c0b6529947b12d85e328726504e2ae49fd199cd.tar.gz
hdf5-1c0b6529947b12d85e328726504e2ae49fd199cd.tar.bz2
[svn-r15948] Purpose: Bug Fix
Description: Adding the SZIP path to LD_LIBRARY_PATH within configure was inadvertently blowing away anything already in LD_LIBRARY_PATH. This fixes that, which solves, among other things, the problem where configure failed to learn how to print 'long long' on cobalt. Tested: full make check install: kagiso, smirom configure / make / h5ls test only : cobalt, linew
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index eb45aef..e940218 100644
--- a/configure.in
+++ b/configure.in
@@ -1676,8 +1676,13 @@ if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
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.
+ if test -z "$LD_LIBRARY_PATH"; then
export LD_LIBRARY_PATH="$szlib_lib"
- AC_SUBST([LL_PATH]) LL_PATH="$szlib_lib"
+ else
+ export LD_LIBRARY_PATH="$szlib_lib:$LD_LIBRARY_PATH"
+ fi
+
+ AC_SUBST([LL_PATH]) LL_PATH="$LD_LIBRARY_PATH"
AC_CACHE_VAL([hdf5_cv_szlib_can_encode],
[AC_TRY_RUN([