diff options
| -rwxr-xr-x | c++/src/h5c++.in | 8 | ||||
| -rwxr-xr-x | fortran/src/h5fc.in | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in index aa436eb..2493ad0 100755 --- a/c++/src/h5c++.in +++ b/c++/src/h5c++.in @@ -251,7 +251,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_cpp -lhdf5_hl -lhdf5 " + libraries=" $libraries -lhdf5_hl_cpp -lhdf5_cpp -lhdf5_hl -lhdf5 " else libraries=" $libraries -lhdf5_cpp -lhdf5 " fi @@ -289,6 +289,12 @@ if test "x$do_link" = "xyes"; then -lhdf5_hl) new_libraries="$new_libraries ${libdir}/libhdf5_hl.a" ;; + -lhdf5_cpp) + new_libraries="$new_libraries ${libdir}/libhdf5_cpp.a" + ;; + -lhdf5_hl_cpp) + new_libraries="$new_libraries ${libdir}/libhdf5_hl_cpp.a" + ;; *) new_libraries="$new_libraries $lib" ;; 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" ;; |