[svn-r10511]

Purpose:
"Bug fix"

Description:
Hardcoded Makefiles to use /bin/sh instead of letting configure
detect shell automatically.  This is what v1.6 does, and avoids
problems on janus.

Platforms tested:
sleipnir, copper, modi4, mir

10 files changed, 60 insertions, 10 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 4df189e..a18751d 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -186,7 +186,12 @@ R_LARGE = @R_LARGE@
 SEARCH = @SEARCH@
 SETX = @SETX@
 SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
+
+# Hardcode SHELL to be /bin/sh.  Most machines have this shell, and
+# on at least one machine configure fails to detect its existence (janus).
+# Also, when HDF5 is configured on one machine but run on another,
+# configure's automatic SHELL detection may not work on the build machine.
+SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 SRB = @SRB@
 STATIC_SHARED = @STATIC_SHARED@
diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index b11fdd4..c4a87e1 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/Makefile.in
@@ -209,7 +209,12 @@ R_LARGE = @R_LARGE@
 SEARCH = @SEARCH@
 SETX = @SETX@
 SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
+
+# Hardcode SHELL to be /bin/sh.  Most machines have this shell, and
+# on at least one machine configure fails to detect its existence (janus).
+# Also, when HDF5 is configured on one machine but run on another,
+# configure's automatic SHELL detection may not work on the build machine.
+SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 SRB = @SRB@
 STATIC_SHARED = @STATIC_SHARED@
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 206822f..8147961 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -217,7 +217,12 @@ R_LARGE = @R_LARGE@
 SEARCH = @SEARCH@
 SETX = @SETX@
 SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
+
+# Hardcode SHELL to be /bin/sh.  Most machines have this shell, and
+# on at least one machine configure fails to detect its existence (janus).
+# Also, when HDF5 is configured on one machine but run on another,
+# configure's automatic SHELL detection may not work on the build machine.
+SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 SRB = @SRB@
 STATIC_SHARED = @STATIC_SHARED@
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index c81c729..c302db7 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -210,7 +210,12 @@ R_LARGE = @R_LARGE@
 SEARCH = @SEARCH@
 SETX = @SETX@
 SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
+
+# Hardcode SHELL to be /bin/sh.  Most machines have this shell, and
+# on at least one machine configure fails to detect its existence (janus).
+# Also, when HDF5 is configured on one machine but run on another,
+# configure's automatic SHELL detection may not work on the build machine.
+SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 SRB = @SRB@
 STATIC_SHARED = @STATIC_SHARED@
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 5618afe..497bd11 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -210,7 +210,12 @@ R_LARGE = @R_LARGE@
 SEARCH = @SEARCH@
 SETX = @SETX@
 SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
+
+# Hardcode SHELL to be /bin/sh.  Most machines have this shell, and
+# on at least one machine configure fails to detect its existence (janus).
+# Also, when HDF5 is configured on one machine but run on another,
+# configure's automatic SHELL detection may not work on the build machine.
+SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 SRB = @SRB@
 STATIC_SHARED = @STATIC_SHARED@
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 0444884..0b234cd 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -205,7 +205,12 @@ R_LARGE = @R_LARGE@
 SEARCH = @SEARCH@
 SETX = @SETX@
 SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
+
+# Hardcode SHELL to be /bin/sh.  Most machines have this shell, and
+# on at least one machine configure fails to detect its existence (janus).
+# Also, when HDF5 is configured on one machine but run on another,
+# configure's automatic SHELL detection may not work on the build machine.
+SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 SRB = @SRB@
 STATIC_SHARED = @STATIC_SHARED@
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index b588a30..1ce0784 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -203,7 +203,12 @@ R_LARGE = @R_LARGE@
 SEARCH = @SEARCH@
 SETX = @SETX@
 SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
+
+# Hardcode SHELL to be /bin/sh.  Most machines have this shell, and
+# on at least one machine configure fails to detect its existence (janus).
+# Also, when HDF5 is configured on one machine but run on another,
+# configure's automatic SHELL detection may not work on the build machine.
+SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 SRB = @SRB@
 STATIC_SHARED = @STATIC_SHARED@
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index da0f144..53ce416 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -225,7 +225,12 @@ R_LARGE = @R_LARGE@
 SEARCH = @SEARCH@
 SETX = @SETX@
 SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
+
+# Hardcode SHELL to be /bin/sh.  Most machines have this shell, and
+# on at least one machine configure fails to detect its existence (janus).
+# Also, when HDF5 is configured on one machine but run on another,
+# configure's automatic SHELL detection may not work on the build machine.
+SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 SRB = @SRB@
 STATIC_SHARED = @STATIC_SHARED@
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index 39c77a3..9557701 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -207,7 +207,12 @@ R_LARGE = @R_LARGE@
 SEARCH = @SEARCH@
 SETX = @SETX@
 SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
+
+# Hardcode SHELL to be /bin/sh.  Most machines have this shell, and
+# on at least one machine configure fails to detect its existence (janus).
+# Also, when HDF5 is configured on one machine but run on another,
+# configure's automatic SHELL detection may not work on the build machine.
+SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 SRB = @SRB@
 STATIC_SHARED = @STATIC_SHARED@
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 77e79d9..23016ab 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -215,7 +215,12 @@ R_LARGE = @R_LARGE@
 SEARCH = @SEARCH@
 SETX = @SETX@
 SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
+
+# Hardcode SHELL to be /bin/sh.  Most machines have this shell, and
+# on at least one machine configure fails to detect its existence (janus).
+# Also, when HDF5 is configured on one machine but run on another,
+# configure's automatic SHELL detection may not work on the build machine.
+SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 SRB = @SRB@
 STATIC_SHARED = @STATIC_SHARED@