diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2011-04-26 18:41:01 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2011-04-26 18:41:01 (GMT) |
| commit | 64c9d25f74a049658c5b5551b33721a6a101c281 (patch) | |
| tree | 7f2b7039c22360f4fa8bc072d3b61e5eef78d73d /configure | |
| parent | 0a71144a4f4216b18b63834da43057234bf0643a (diff) | |
| download | hdf5-64c9d25f74a049658c5b5551b33721a6a101c281.zip hdf5-64c9d25f74a049658c5b5551b33721a6a101c281.tar.gz hdf5-64c9d25f74a049658c5b5551b33721a6a101c281.tar.bz2 | |
[svn-r20640] Remove export from "export LD_LIBRARY_PATH=${LL_PATH}" in examples and hl/examples Makefiles.
"export" breaks make install in Daily Tests on FreeBSD machines and isn't missed elsewhere.
Tested on amani, freedom, jam, heiwa, and loyalty.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 20502 2011-04-14 19:45:57Z mamcgree . +# From configure.in Id: configure.in 20520 2011-04-15 20:10:47Z acheng . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.68 for HDF5 1.9.81. # @@ -662,8 +662,8 @@ TRACE_API DEBUG_PKG H5_LONE_COLON PTHREAD -BUILD_SZIP_CONDITIONAL_FALSE -BUILD_SZIP_CONDITIONAL_TRUE +BUILD_SHARED_SZIP_CONDITIONAL_FALSE +BUILD_SHARED_SZIP_CONDITIONAL_TRUE LL_PATH USE_FILTER_SZIP USE_FILTER_DEFLATE @@ -25147,12 +25147,12 @@ $as_echo "no" >&6; } fi - if test "X$USE_FILTER_SZIP" = "Xyes"; then - BUILD_SZIP_CONDITIONAL_TRUE= - BUILD_SZIP_CONDITIONAL_FALSE='#' + if test "X$USE_FILTER_SZIP" = "Xyes" && test "X$LL_PATH" != "X"; then + BUILD_SHARED_SZIP_CONDITIONAL_TRUE= + BUILD_SHARED_SZIP_CONDITIONAL_FALSE='#' else - BUILD_SZIP_CONDITIONAL_TRUE='#' - BUILD_SZIP_CONDITIONAL_FALSE= + BUILD_SHARED_SZIP_CONDITIONAL_TRUE='#' + BUILD_SHARED_SZIP_CONDITIONAL_FALSE= fi @@ -30030,8 +30030,8 @@ if test -z "${CXX_SHARED_CONDITIONAL_TRUE}" && test -z "${CXX_SHARED_CONDITIONAL Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${BUILD_SZIP_CONDITIONAL_TRUE}" && test -z "${BUILD_SZIP_CONDITIONAL_FALSE}"; then - as_fn_error $? "conditional \"BUILD_SZIP_CONDITIONAL\" was never defined. +if test -z "${BUILD_SHARED_SZIP_CONDITIONAL_TRUE}" && test -z "${BUILD_SHARED_SZIP_CONDITIONAL_FALSE}"; then + as_fn_error $? "conditional \"BUILD_SHARED_SZIP_CONDITIONAL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DIRECT_VFD_CONDITIONAL_TRUE}" && test -z "${DIRECT_VFD_CONDITIONAL_FALSE}"; then |