[svn-r24293] Bring revisions #24058 - #24098 from trunk to revise_chunks.

h5committested.

2 files changed, 8 insertions, 4 deletions

diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index 261a7b0..f601487 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -467,7 +467,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 152
+LT_VERS_REVISION = 154
 LT_VERS_AGE = 0
 
 # Include src directory
diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in
index 4c86c6a..a4aaf52 100644
--- a/c++/src/h5c++.in
+++ b/c++/src/h5c++.in
@@ -122,9 +122,10 @@ usage() {
   echo "                   subdirectories [default: $prefix]"
   echo "    -show        Show the commands without executing them"
   echo "    -showconfig  Show the HDF5 library configuration summary"
-  echo "    -shlib       Compile with shared HDF5 libraries [default when built with"
-  echo "                                                     disable-static]"
-  echo "    -noshlib     Compile with static HDF5 libraries [default when static available]"
+  echo "    -shlib       Compile with shared HDF5 libraries [default for hdf5 built"
+  echo "                                                     without static libraries]"
+  echo "    -noshlib     Compile with static HDF5 libraries [default for hdf5 built"
+  echo "                                                     with static libraries]"
   echo " "
   echo "  <compile line>  - the normal compile line options for your compiler."
   echo "                    $prog_name uses the same compiler you used to compile"
@@ -137,6 +138,9 @@ usage() {
   echo " "
   echo "   HDF5_CXX                 -  use a different C++ compiler"
   echo "   HDF5_CXXLINKER           -  use a different linker"
+  echo "   HDF5_USE_SHLIB=[yes|no]  -  use shared or static version of the HDF5 library"
+  echo "                                 [default: no except when built with only"
+  echo "                                           shared libraries]"
   echo " You can also add or change paths and flags to the compile line using"
   echo " the following environment varibles or by assigning them to their counterparts"
   echo " in the 'Things You Can Modify to Override...'" section of $prog_name