summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2014-12-19 19:50:58 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2014-12-19 19:50:58 (GMT)
commit1d83ae98b96fd7be060f9403eedbf3b676d11c67 (patch)
tree2cf6626d143ac8232b9b520233731079321a80aa
parent91f7c2797f2e0a23377ff5391bf4e7ded54bae40 (diff)
downloadhdf5-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-xconfigure6
-rw-r--r--configure.ac6
2 files changed, 2 insertions, 10 deletions
diff --git a/configure b/configure
index a309ff3..2e5e000 100755
--- a/configure
+++ b/configure
@@ -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}"