diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2014-04-25 21:59:53 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2014-04-25 21:59:53 (GMT) |
| commit | c6e3e682973aa793844e39376cb7ada93ce505ba (patch) | |
| tree | 190929e40042c15843c28d591a1c0e336c743dc4 /configure.ac | |
| parent | 7309bb5ab8810a701d5aa98c8068b98792585d9a (diff) | |
| download | hdf5-c6e3e682973aa793844e39376cb7ada93ce505ba.zip hdf5-c6e3e682973aa793844e39376cb7ada93ce505ba.tar.gz hdf5-c6e3e682973aa793844e39376cb7ada93ce505ba.tar.bz2 | |
[svn-r25117] Removed LT_ADD_LIBHDF5_DEPENDENCY configure conditional to roll back fix for removing rpaths from l
ib files. The fix also removed dependencies on libhdf5, etc. when the --disable-sharedlib-rpath co
nfigure 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 with configure option --disable-sharedlib-rpath on emu, platypus and quail.
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 cd046f4..8cd6328 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 |