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.ac | |
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.ac')
-rw-r--r-- | configure.ac | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index e147076..2e54f72 100644 --- a/configure.ac +++ b/configure.ac @@ -1081,6 +1081,7 @@ case "X-$RPATH" in runpath_var= hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld= + hardcode_into_libs=no ;; X-|X-yes) AC_MSG_RESULT([yes]) @@ -1090,15 +1091,6 @@ case "X-$RPATH" in AC_MSG_ERROR([\'$enableval\' is not a valid rpath type]) ;; 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. -AM_CONDITIONAL([LT_ADD_LIBHDF5_DEPENDENCY], [test "X$runpath_var" != X]) - -AC_SUBST([LT_ADD_LIBHDF5_DEPENDENCY]) - -AC_MSG_CHECKING([make]) ## ---------------------------------------------------------------------- ## Sometimes makes think the `.PATH:' appearing before the first rule |