From 1e486e1684038fc273f9088debdaada987ecf529 Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Wed, 4 Mar 2015 12:15:04 -0500
Subject: [svn-r26358] Revert change r25705: 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    | 9 ++-------
 configure.ac | 7 +------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/configure b/configure
index 5ef3811..4d605ef 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Id: configure.ac 26314 2015-02-26 15:21:33Z brtnfld .
+# From configure.ac Id: configure.ac 26326 2015-02-27 04:01:50Z derobins .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for HDF5 1.8.15-snap11.
 #
@@ -3914,12 +3914,7 @@ AM_CFLAGS="${AM_CFLAGS}"
 AM_CXXFLAGS="${AM_CXXFLAGS}"
 AM_FCFLAGS="${AM_FCFLAGS}"
 AM_CPPFLAGS="${AM_CPPFLAGS}"
-# Added to address HDFFV-8944
-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 5e5b59f..2786bf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,12 +115,7 @@ AM_CFLAGS="${AM_CFLAGS}"
 AM_CXXFLAGS="${AM_CXXFLAGS}"
 AM_FCFLAGS="${AM_FCFLAGS}"
 AM_CPPFLAGS="${AM_CPPFLAGS}"
-# Added to address HDFFV-8944
-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