summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2013-04-03 22:11:13 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2013-04-03 22:11:13 (GMT)
commit06a302be30b93f0ae4430335e51c9e6bb2cff06f (patch)
tree5bb8cf0b792842d2b84a2e926a88eb2d306a730f /fortran
parent00a5fe5cf40dbd9493c6783bc402fd90af96beff (diff)
downloadhdf5-06a302be30b93f0ae4430335e51c9e6bb2cff06f.zip
hdf5-06a302be30b93f0ae4430335e51c9e6bb2cff06f.tar.gz
hdf5-06a302be30b93f0ae4430335e51c9e6bb2cff06f.tar.bz2
[svn-r23541] Reverted changes merged unintentionally with revision 23488 from trunk that will not go into the 1.8.11 release.
Tested with h5committest.
Diffstat (limited to 'fortran')
-rw-r--r--fortran/src/h5fc.in25
1 files changed, 1 insertions, 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