diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2008-10-24 21:30:07 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2008-10-24 21:30:07 (GMT) |
| commit | dc4434724c3f7b4031fafde9e734d47af0bb97a0 (patch) | |
| tree | 47fb1775f50a376cf0c9f325dd4624031a9c22bf | |
| parent | fb1499b60cbeb1932e7f612f57bfd29497c22e98 (diff) | |
| download | hdf5-dc4434724c3f7b4031fafde9e734d47af0bb97a0.zip hdf5-dc4434724c3f7b4031fafde9e734d47af0bb97a0.tar.gz hdf5-dc4434724c3f7b4031fafde9e734d47af0bb97a0.tar.bz2 | |
[svn-r15947] 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
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | configure.in | 7 |
2 files changed, 14 insertions, 4 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 15913 2008-10-21 05:05:50Z acheng . +# From configure.in Id: configure.in 15943 2008-10-24 19:12:21Z songyulu . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for HDF5 1.9.20. # @@ -43578,8 +43578,13 @@ 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; } - export LD_LIBRARY_PATH="$szlib_lib" - LL_PATH="$szlib_lib" + if test -z "$LD_LIBRARY_PATH"; then + export LD_LIBRARY_PATH="$szlib_lib" + else + export LD_LIBRARY_PATH="$szlib_lib:$LD_LIBRARY_PATH" + fi + + LL_PATH="$LD_LIBRARY_PATH" if test "${hdf5_cv_szlib_can_encode+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 diff --git a/configure.in b/configure.in index b72b5e4..f758865 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([ |