From da8344c06474d9e1f8eb2f9a343ac8c83660a56f Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Tue, 14 Oct 2014 16:32:56 -0500
Subject: [svn-r25705] Add LD path to HDF5 install directory to address
 HDFFV-8944.

Tested with h5committest and failed external daily tests.
---
 c++/src/Makefile.in        | 2 ++
 configure                  | 9 +++++++--
 configure.ac               | 7 ++++++-
 fortran/src/Makefile.in    | 2 ++
 hl/c++/src/Makefile.in     | 2 ++
 hl/fortran/src/Makefile.in | 2 ++
 hl/src/Makefile.in         | 2 ++
 src/Makefile.in            | 2 ++
 8 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index e27a28a..3b71cb4 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -680,6 +680,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
+# After making changes, run bin/reconfigure to update other configure related
+# files like Makefile.in.
 LT_VERS_INTERFACE = 9
 LT_VERS_REVISION = 1
 LT_VERS_AGE = 0
diff --git a/configure b/configure
index 3b7c7f9..f7cb837 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Id: configure.ac 25669 2014-10-05 23:06:15Z hdftest .
+# From configure.ac Id: configure.ac 25673 2014-10-06 19:19:35Z acheng .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for HDF5 1.8.15-snap0.
 #
@@ -4007,7 +4007,12 @@ AM_CFLAGS="${AM_CFLAGS}"
 AM_CXXFLAGS="${AM_CXXFLAGS}"
 AM_FCFLAGS="${AM_FCFLAGS}"
 AM_CPPFLAGS="${AM_CPPFLAGS}"
-AM_LDFLAGS="${AM_LDFLAGS}"
+# 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
 CFLAGS="${CFLAGS}"
 CXXFLAGS="${CXXFLAGS}"
 FCFLAGS="${FCFLAGS}"
diff --git a/configure.ac b/configure.ac
index 4d8d32c..72c2d51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,7 +115,12 @@ AM_CFLAGS="${AM_CFLAGS}"
 AM_CXXFLAGS="${AM_CXXFLAGS}"
 AM_FCFLAGS="${AM_FCFLAGS}"
 AM_CPPFLAGS="${AM_CPPFLAGS}"
-AM_LDFLAGS="${AM_LDFLAGS}"
+# 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
 CFLAGS="${CFLAGS}"
 CXXFLAGS="${CXXFLAGS}"
 FCFLAGS="${FCFLAGS}"
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 9915932..1fede4d 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -731,6 +731,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
+# After making changes, run bin/reconfigure to update other configure related
+# files like Makefile.in.
 LT_VERS_INTERFACE = 9
 LT_VERS_REVISION = 1
 LT_VERS_AGE = 0
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 5a02f9f..482d8da 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -672,6 +672,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
+# After making changes, run bin/reconfigure to update other configure related
+# files like Makefile.in.
 LT_VERS_INTERFACE = 9
 LT_VERS_REVISION = 1
 LT_VERS_AGE = 0
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 9e8f840..97ce320 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -687,6 +687,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
+# After making changes, run bin/reconfigure to update other configure related
+# files like Makefile.in.
 LT_VERS_INTERFACE = 9
 LT_VERS_REVISION = 1
 LT_VERS_AGE = 0
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index 120ced4..5f7cb2c 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -668,6 +668,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
+# After making changes, run bin/reconfigure to update other configure related
+# files like Makefile.in.
 LT_VERS_INTERFACE = 9
 LT_VERS_REVISION = 1
 LT_VERS_AGE = 0
diff --git a/src/Makefile.in b/src/Makefile.in
index 4f23820..f6914ae 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -726,6 +726,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
+# After making changes, run bin/reconfigure to update other configure related
+# files like Makefile.in.
 LT_VERS_INTERFACE = 9
 LT_VERS_REVISION = 1
 LT_VERS_AGE = 0
-- 
cgit v0.12