From 1d83ae98b96fd7be060f9403eedbf3b676d11c67 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Fri, 19 Dec 2014 14:50:58 -0500 Subject: [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 --- configure | 6 +----- configure.ac | 6 +----- 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}" -- cgit v0.12