summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-11-01 17:41:48 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-11-01 17:41:48 (GMT)
commite6930a615e3f099872b72db6d86bbd174870c3bb (patch)
tree3e67ce2ac2c6bea4a78666f190afb5bab45f9496 /fortran
parent0cc4fba8b74dafa5ba464c56fa5ca2afac9e663b (diff)
downloadhdf5-e6930a615e3f099872b72db6d86bbd174870c3bb.zip
hdf5-e6930a615e3f099872b72db6d86bbd174870c3bb.tar.gz
hdf5-e6930a615e3f099872b72db6d86bbd174870c3bb.tar.bz2
[svn-r11655] Purpose:
Bug fix Description: Fixed a bug when using h5fc and h5c++ with static libraries. Added high-level C++ and Fortran libraries to h5c++ and h5fc. Solution: Platforms tested: mir, heping, shanti, sleipnir
Diffstat (limited to 'fortran')
-rwxr-xr-xfortran/src/h5fc.in12
1 files changed, 9 insertions, 3 deletions
diff --git a/fortran/src/h5fc.in b/fortran/src/h5fc.in
index 93bebe8..0a266bf 100755
--- a/fortran/src/h5fc.in
+++ b/fortran/src/h5fc.in
@@ -236,7 +236,7 @@ if test "x$do_link" = "xyes"; then
shared_link=""
# conditionnaly link with the hl library
if test "X$HL" = "Xhl"; then
- libraries=" $libraries -lhdf5_fortran -lhdf5_hl -lhdf5 "
+ libraries=" $libraries -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 "
else
libraries=" $libraries -lhdf5_fortran -lhdf5 "
fi
@@ -256,8 +256,8 @@ if test "x$do_link" = "xyes"; then
fi
if test "x$USE_SHARED_LIB" != "xyes"; then
- # The "-lhdf5" & "-lhdf5_hl" flags are in here already...This is a static
- # compile though, so change it to the static version (.a) of the library.
+ # The hdf5 library "-l" flags are in here already. This is a static
+ # compile though, so change it to the static versions (.a) of the libraries.
new_libraries=""
for lib in $libraries; do
case "$lib" in
@@ -267,6 +267,12 @@ if test "x$do_link" = "xyes"; then
-lhdf5_hl)
new_libraries="$new_libraries ${libdir}/libhdf5_hl.a"
;;
+ -lhdf5_fortran)
+ new_libraries="$new_libraries ${libdir}/libhdf5_fortran.a"
+ ;;
+ -lhdf5hl_fortran)
+ new_libraries="$new_libraries ${libdir}/libhdf5hl_fortran.a"
+ ;;
*)
new_libraries="$new_libraries $lib"
;;