[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

1 files changed, 7 insertions, 1 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"
           ;;