From 6d82d6c7cdb1c1449eb7783b3ecb7b50c0bc7949 Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Mon, 13 Oct 2014 22:14:29 -0500
Subject: [svn-r25701] Add LD path to HDF5 install directory to address
 HDFFV-8944.

Tested with h5committest and failed external daily tests.
---
 configure    | 8 ++++++--
 configure.ac | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 44547fa..a9120ce 100755
--- a/configure
+++ b/configure
@@ -4003,7 +4003,11 @@ AM_CFLAGS="${AM_CFLAGS}"
 AM_CXXFLAGS="${AM_CXXFLAGS}"
 AM_FCFLAGS="${AM_FCFLAGS}"
 AM_CPPFLAGS="${AM_CPPFLAGS}"
-AM_LDFLAGS="${AM_LDFLAGS}"
+if test "x$prefix" = xNONE; then
+  AM_LDFLAGS="${AM_LDFLAGS} -L$ac_default_prefix/lib"
+else
+  AM_LDFLAGS="$AM_LDFLAGS -L$prefix/lib"
+fi
 CFLAGS="${CFLAGS}"
 CXXFLAGS="${CXXFLAGS}"
 FCFLAGS="${FCFLAGS}"
@@ -26240,7 +26244,7 @@ $as_echo_n "checking for szlib encoder... " >&6; }
   if test -z "$LD_LIBRARY_PATH"; then
     export LD_LIBRARY_PATH="$szlib_lib"
   else
-    export LD_LIBRARY_PATH="$szlib_lib:$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$szlib_lib"
   fi
 
    LL_PATH="$LD_LIBRARY_PATH"
diff --git a/configure.ac b/configure.ac
index 91c5b29..c17014b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,7 +115,11 @@ AM_CFLAGS="${AM_CFLAGS}"
 AM_CXXFLAGS="${AM_CXXFLAGS}"
 AM_FCFLAGS="${AM_FCFLAGS}"
 AM_CPPFLAGS="${AM_CPPFLAGS}"
-AM_LDFLAGS="${AM_LDFLAGS}"
+if test "x$prefix" = xNONE; then
+  AM_LDFLAGS="${AM_LDFLAGS} -L$ac_default_prefix/lib"
+else
+  AM_LDFLAGS="$AM_LDFLAGS -L$prefix/lib"
+fi
 CFLAGS="${CFLAGS}"
 CXXFLAGS="${CXXFLAGS}"
 FCFLAGS="${FCFLAGS}"
@@ -1904,7 +1908,7 @@ if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
   if test -z "$LD_LIBRARY_PATH"; then
     export LD_LIBRARY_PATH="$szlib_lib"
   else
-    export LD_LIBRARY_PATH="$szlib_lib:$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$szlib_lib"
   fi
 
   AC_SUBST([LL_PATH]) LL_PATH="$LD_LIBRARY_PATH"
-- 
cgit v0.12