[svn-r22819] Added H5BLD_STATIC and HDF5_USE_SHLIB to configure.ac so that if configured with --disable-static the default for HDF5_USE_SHLIB in the compile scripts will be changed to yes. This is a fix for HDFFV-8141, where the compile scripts try to link to non-existant static hdf5 libraries.

Tested on jam,koala,ostrich(h5committest) and other THG machines. 

12 files changed, 26 insertions, 0 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 70e11ae..e047265 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -216,6 +216,7 @@ FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GPFS = @GPFS@
 GREP = @GREP@
+H5BLD_STATIC = @H5BLD_STATIC@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -230,6 +231,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
+HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@
diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in
index da9d0b7..b7cfa19 100644
--- a/tools/h5copy/Makefile.in
+++ b/tools/h5copy/Makefile.in
@@ -222,6 +222,7 @@ FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GPFS = @GPFS@
 GREP = @GREP@
+H5BLD_STATIC = @H5BLD_STATIC@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -236,6 +237,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
+HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 4676341..23088a6 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -229,6 +229,7 @@ FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GPFS = @GPFS@
 GREP = @GREP@
+H5BLD_STATIC = @H5BLD_STATIC@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -243,6 +244,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
+HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 6b4a6e6..2bdae35 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -228,6 +228,7 @@ FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GPFS = @GPFS@
 GREP = @GREP@
+H5BLD_STATIC = @H5BLD_STATIC@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -242,6 +243,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
+HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 16e8901..6f938c1 100644
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -222,6 +222,7 @@ FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GPFS = @GPFS@
 GREP = @GREP@
+H5BLD_STATIC = @H5BLD_STATIC@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -236,6 +237,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
+HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index ff8b089..7d425ca 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -236,6 +236,7 @@ FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GPFS = @GPFS@
 GREP = @GREP@
+H5BLD_STATIC = @H5BLD_STATIC@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -250,6 +251,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
+HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index 7aa4329..64adfbd 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -216,6 +216,7 @@ FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GPFS = @GPFS@
 GREP = @GREP@
+H5BLD_STATIC = @H5BLD_STATIC@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -230,6 +231,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
+HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 389339f..de0bb1f 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -236,6 +236,7 @@ FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GPFS = @GPFS@
 GREP = @GREP@
+H5BLD_STATIC = @H5BLD_STATIC@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -250,6 +251,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
+HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@
diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in
index 389e460..807e4cb 100644
--- a/tools/h5stat/Makefile.in
+++ b/tools/h5stat/Makefile.in
@@ -251,6 +251,7 @@ FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GPFS = @GPFS@
 GREP = @GREP@
+H5BLD_STATIC = @H5BLD_STATIC@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -265,6 +266,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
+HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index 6a76e1d..58bbddc 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -214,6 +214,7 @@ FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GPFS = @GPFS@
 GREP = @GREP@
+H5BLD_STATIC = @H5BLD_STATIC@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -228,6 +229,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
+HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 8c2e1c1..e3884f4 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -276,6 +276,7 @@ FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GPFS = @GPFS@
 GREP = @GREP@
+H5BLD_STATIC = @H5BLD_STATIC@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -290,6 +291,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
+HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@
diff --git a/tools/misc/h5cc.in b/tools/misc/h5cc.in
index 233c80a..d05b920 100644
--- a/tools/misc/h5cc.in
+++ b/tools/misc/h5cc.in
@@ -102,6 +102,10 @@ CPPFLAGS="${HDF5_CPPFLAGS:-$CPPFLAGSBASE}"
 LDFLAGS="${HDF5_LDFLAGS:-$LDFLAGSBASE}"
 LIBS="${HDF5_LIBS:-$LIBSBASE}"
 
+# If static was disabled, @HDF5_USE_SHLIB@ will be yes.  In that case
+# HDF5_USE_SHLIB should be set to yes because there are no static
+# lib files.
+HDF5_USE_SHLIB="@HDF5_USE_SHLIB@"
 USE_SHARED_LIB="${HDF5_USE_SHLIB:-no}"
 
 usage() {