diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2014-04-25 19:34:54 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2014-04-25 19:34:54 (GMT) |
commit | b018ba48ced579975e60362e3acfb6afb1f1d384 (patch) | |
tree | 6aa56f1b84f2a5734964a72faefc33280e3cce47 /configure | |
parent | bbaec6dfe44e8878345de2594dc97f1bc8d361ba (diff) | |
download | hdf5-b018ba48ced579975e60362e3acfb6afb1f1d384.zip hdf5-b018ba48ced579975e60362e3acfb6afb1f1d384.tar.gz hdf5-b018ba48ced579975e60362e3acfb6afb1f1d384.tar.bz2 |
[svn-r25106] Removed LT_ADD_LIBHDF5_DEPENDENCY configure conditional to roll back fix for removing rpaths from lib files. The fix also removed dependencies on libhdf5, etc. when the --disable-sharedlib-rpath configure option was invoked.
Added instead configure variable hardcode_into_lib=no. This removes rpath from lib files on Linux and solaris machines.
Tested with h5committest on jam, koala, ostrich and platypus (cmake), and on emu and kite.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 27 |
1 files changed, 2 insertions, 25 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Id: configure.ac 25036 2014-04-14 12:20:06Z epourmal . +# From configure.ac Id: configure.ac 25071 2014-04-20 17:17:26Z hdftest . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for HDF5 1.8.14-snap1. # @@ -690,9 +690,6 @@ LL_PATH USE_FILTER_SZIP USE_FILTER_DEFLATE AM_MAKEFLAGS -LT_ADD_LIBHDF5_DEPENDENCY -LT_ADD_LIBHDF5_DEPENDENCY_FALSE -LT_ADD_LIBHDF5_DEPENDENCY_TRUE LT_STATIC_EXEC USE_PLUGINS_CONDITIONAL_FALSE USE_PLUGINS_CONDITIONAL_TRUE @@ -22231,6 +22228,7 @@ $as_echo "no" >&6; } runpath_var= hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld= + hardcode_into_libs=no ;; X-|X-yes) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -22242,23 +22240,6 @@ $as_echo "error" >&6; } as_fn_error $? "\'$enableval\' is not a valid rpath type" "$LINENO" 5 ;; esac -## ---------------------------------------------------------------------- -## When sharedlib-rpath is disabled, setting runpath_var to "" above, don't -## add libhdf5 as a dependency for the other hdf5 libs, either. This keeps -## the rpath to libhdf5 out of the lib files as well as the executables. - if test "X$runpath_var" != X; then - LT_ADD_LIBHDF5_DEPENDENCY_TRUE= - LT_ADD_LIBHDF5_DEPENDENCY_FALSE='#' -else - LT_ADD_LIBHDF5_DEPENDENCY_TRUE='#' - LT_ADD_LIBHDF5_DEPENDENCY_FALSE= -fi - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking make" >&5 -$as_echo_n "checking make... " >&6; } ## ---------------------------------------------------------------------- ## Sometimes makes think the `.PATH:' appearing before the first rule @@ -33444,10 +33425,6 @@ if test -z "${USE_PLUGINS_CONDITIONAL_TRUE}" && test -z "${USE_PLUGINS_CONDITION as_fn_error $? "conditional \"USE_PLUGINS_CONDITIONAL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${LT_ADD_LIBHDF5_DEPENDENCY_TRUE}" && test -z "${LT_ADD_LIBHDF5_DEPENDENCY_FALSE}"; then - as_fn_error $? "conditional \"LT_ADD_LIBHDF5_DEPENDENCY\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi 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. |