diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2014-12-19 19:50:58 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2014-12-19 19:50:58 (GMT) |
| commit | 1d83ae98b96fd7be060f9403eedbf3b676d11c67 (patch) | |
| tree | 2cf6626d143ac8232b9b520233731079321a80aa | |
| parent | 91f7c2797f2e0a23377ff5391bf4e7ded54bae40 (diff) | |
| download | hdf5-1d83ae98b96fd7be060f9403eedbf3b676d11c67.zip hdf5-1d83ae98b96fd7be060f9403eedbf3b676d11c67.tar.gz hdf5-1d83ae98b96fd7be060f9403eedbf3b676d11c67.tar.bz2 | |
[svn-r25912] Revert change r25701: Add LD path to HDF5 install directory to address HDFFV-8944.
The change broke DESTDIR builds where an older HDF5 is installed in the --prefix directory.
The original problem remains.
Tested with h5committest
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 2 insertions, 10 deletions
@@ -4003,11 +4003,7 @@ AM_CFLAGS="${AM_CFLAGS}" AM_CXXFLAGS="${AM_CXXFLAGS}" AM_FCFLAGS="${AM_FCFLAGS}" AM_CPPFLAGS="${AM_CPPFLAGS}" -if test "x$prefix" = xNONE; then - AM_LDFLAGS="${AM_LDFLAGS} -L$ac_default_prefix/lib" -else - AM_LDFLAGS="$AM_LDFLAGS -L$prefix/lib" -fi +AM_LDFLAGS="${AM_LDFLAGS}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FCFLAGS="${FCFLAGS}" diff --git a/configure.ac b/configure.ac index d988751..3f30e8c 100644 --- a/configure.ac +++ b/configure.ac @@ -115,11 +115,7 @@ AM_CFLAGS="${AM_CFLAGS}" AM_CXXFLAGS="${AM_CXXFLAGS}" AM_FCFLAGS="${AM_FCFLAGS}" AM_CPPFLAGS="${AM_CPPFLAGS}" -if test "x$prefix" = xNONE; then - AM_LDFLAGS="${AM_LDFLAGS} -L$ac_default_prefix/lib" -else - AM_LDFLAGS="$AM_LDFLAGS -L$prefix/lib" -fi +AM_LDFLAGS="${AM_LDFLAGS}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FCFLAGS="${FCFLAGS}" |