[svn-r24077] Updated -help output for compile scripts for changing default from -noshlib to -shlib when hdf5 is built without static libraries (--disable-static).

Tested with h5committest on jam, koala, ostrich and platypus.

3 files changed, 19 insertions, 11 deletions

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
diff --git a/fortran/src/h5fc.in b/fortran/src/h5fc.in
index 1285541..b5a6486 100644
--- a/fortran/src/h5fc.in
+++ b/fortran/src/h5fc.in
@@ -118,9 +118,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"
@@ -133,7 +134,8 @@ usage() {
   echo "   HDF5_FC                  -  use a different Fortran 90 or 95 compiler"
   echo "   HDF5_FLINKER             -  use a different linker"
   echo "   HDF5_USE_SHLIB=[yes|no]  -  use shared or static version of the HDF5 library"
-  echo "                                 [default: no]"
+  echo "                                 [default: no except when built with only"
+  echo "                                           shared libraries]"
   echo " "
   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"
diff --git a/tools/misc/h5cc.in b/tools/misc/h5cc.in
index f62c66f..da1a26d 100644
--- a/tools/misc/h5cc.in
+++ b/tools/misc/h5cc.in
@@ -132,9 +132,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"
@@ -148,7 +149,8 @@ usage() {
   echo "   HDF5_CC                  -  use a different C compiler"
   echo "   HDF5_CLINKER             -  use a different linker"
   echo "   HDF5_USE_SHLIB=[yes|no]  -  use shared or static version of the HDF5 library"
-  echo "                                 [default: no]"
+  echo "                                 [default: no except when built with only" 
+  echo "                                           shared libraries]"
   echo " "
   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"