[hdf5/epel7] Change LD_LIBRARY_PATH patch to change configure.ac/Makefile.am since we are running autoreconf now

[Orion Poplawski]

commit 0d21f90329cbee5e1095d2c5c78aaaee8e1e0331
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Mar 4 13:25:47 2015 -0700

    Change LD_LIBRARY_PATH patch to change configure.ac/Makefile.am since we are running autoreconf now

 hdf5-LD_LIBRARY_PATH.patch | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)
---
diff --git a/hdf5-LD_LIBRARY_PATH.patch b/hdf5-LD_LIBRARY_PATH.patch
index f34ea69..e4025c1 100644
--- a/hdf5-LD_LIBRARY_PATH.patch
+++ b/hdf5-LD_LIBRARY_PATH.patch
@@ -1,20 +1,28 @@
-diff -up hdf5-1.8.10/configure.LD_LIBRARY_PATH hdf5-1.8.10/configure
---- hdf5-1.8.10/configure.LD_LIBRARY_PATH	2012-10-26 18:14:59.000000000 -0600
-+++ hdf5-1.8.10/configure	2012-11-14 08:56:52.695024834 -0700
-@@ -27496,9 +27496,6 @@ if ${hdf5_cv_printf_ll+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
- 
+--- hdf5-1.8.12/configure.ac.LD_LIBRARY_PATH	2015-03-04 13:20:53.164831682 -0700
++++ hdf5-1.8.12/configure.ac	2015-03-04 13:23:17.852904172 -0700
+@@ -2342,14 +2342,9 @@
+ ## Try to figure out how to print `long long'.  Some machines use `%lld'
+ ## and others use `%qd'.  There may be more!  The final `l' is a
+ ## default in case none of the others work.
+-## Need to patch up LD_LIBRARY_PATH so that the execution can find all
+-## the dynamic library.  The correct way to do it should be updating
+-## LD_LIBRARY_PATH along with LDFLAGS or do it with the AC_TRY_RUN macro.
+ ##
+ AC_MSG_CHECKING([how to print long long])
+ AC_CACHE_VAL([hdf5_cv_printf_ll], [
 -LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $AM_LDFLAGS $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`"
 -export LD_LIBRARY_PATH
--
+ 
  for hdf5_cv_printf_ll in l ll L q unknown; do
-    if test "$cross_compiling" = yes; then :
-   continue
-diff -up hdf5-1.8.10/src/Makefile.in.LD_LIBRARY_PATH hdf5-1.8.10/src/Makefile.in
---- hdf5-1.8.10/src/Makefile.in.LD_LIBRARY_PATH	2012-10-26 18:14:55.000000000 -0600
-+++ hdf5-1.8.10/src/Makefile.in	2012-11-14 08:55:35.197476914 -0700
-@@ -1327,8 +1327,6 @@ help:
+    AC_TRY_RUN([
+--- hdf5-1.8.12/src/Makefile.am.LD_LIBRARY_PATH	2013-11-21 08:13:52.000000000 -0700
++++ hdf5-1.8.12/src/Makefile.am	2015-03-04 13:22:19.355266916 -0700
+@@ -122,25 +122,17 @@
+ settings_DATA=libhdf5.settings
+ 
+ # Number format detection
+-# The LD_LIBRARY_PATH setting is a kludge.
+-# Things should have been all set during H5detect making.
  # Remove the generated .c file if errors occur unless HDF5_Make_Ignore
  # is set to ignore the error.
  H5Tinit.c: H5detect$(EXEEXT)
@@ -23,7 +31,10 @@ diff -up hdf5-1.8.10/src/Makefile.in.LD_LIBRARY_PATH hdf5-1.8.10/src/Makefile.in
  	$(RUNSERIAL) ./H5detect$(EXEEXT) > $@  ||                               \
  	    (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||          \
  	    ($(RM) $@ ; exit 1)
-@@ -1339,8 +1337,6 @@ H5Tinit.c: H5detect$(EXEEXT)
+ 
+ # Build configuration header file generation
+-# The LD_LIBRARY_PATH setting is a kludge.
+-# Things should have been all set during H5make_libsettings making.
  # Remove the generated .c file if errors occur unless HDF5_Make_Ignore
  # is set to ignore the error.
  H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings