From 06a302be30b93f0ae4430335e51c9e6bb2cff06f Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Wed, 3 Apr 2013 17:11:13 -0500
Subject: [svn-r23541] Reverted changes merged unintentionally with revision
 23488 from trunk that will not go into the 1.8.11 release.

Tested with h5committest.
---
 fortran/src/h5fc.in | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/fortran/src/h5fc.in b/fortran/src/h5fc.in
index 37f7c71..2e29e72 100644
--- a/fortran/src/h5fc.in
+++ b/fortran/src/h5fc.in
@@ -97,16 +97,7 @@ FFLAGS="${HDF5_FFLAGS:-$FFLAGSBASE}"
 LDFLAGS="${HDF5_LDFLAGS:-$LDFLAGSBASE}"
 LIBS="${HDF5_LIBS:-$LIBSBASE}"
 
-# If a static library is available, the default will be to use it.  If the only
-# available library is shared, it will be used by default.  The user can
-# override either default, although choosing an unavailable library will result
-# in link errors.
-STATIC_AVAILABLE="@enable_static@"
-if test "${STATIC_AVAILABLE}" = "yes"; then
-  USE_SHARED_LIB="${HDF5_USE_SHLIB:-no}"
-else
-  USE_SHARED_LIB="${HDF5_USE_SHLIB:-yes}"
-fi
+USE_SHARED_LIB="${HDF5_USE_SHLIB:-no}"
 
 usage() {
   # A wonderfully informative "usage" message.
@@ -316,20 +307,6 @@ if test "x$do_link" = "xyes"; then
 
   if test -n "$flag"; then
     shared_link="${flag}${libdir}"
-    # Any libraries in LDFLAGS or H5BLD_LDFLAGS also should have rpaths embedded
-    # in the executables created by h5cc (reduces need for LD_LIBRARY_PATH).
-    if test -n "$LDFLAGS"; then
-      for entry in $LDFLAGS; do
-        extdir=`echo $entry | sed '/^-L/ s/^-L//'`
-        shared_link="${shared_link} ${flag}${extdir}"
-      done
-    fi
-    if test -n "$H5BLD_LDFLAGS"; then
-      for entry in $H5BLD_LDFLAGS; do
-        extdir=`echo $entry | sed '/^-L/ s/^-L//'`
-        shared_link="${shared_link} ${flag}${extdir}"
-      done
-    fi
   fi
 
   if test "x$USE_SHARED_LIB" != "xyes"; then
-- 
cgit v0.12