[svn-r12295] Purpose:

Several bug fixes

Description:
Added config file for Cray X1 (previous file was misnamed)
Simplified some code in hyperslab.c test that seemed to have been
confusing compiler on Cray X1.
Fixed typo in config/commence.am
Cleaned up hl/src/Makefile.am

Solution:
All four fixes should be straightforward.  The failure on Cray was
very difficult to debug, but involved arithmetic errors.
This change seems to fix it.

Platforms tested:
heping, copper, sol, some Cray X1 (more testing when system comes back up)

9 files changed, 27 insertions, 27 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 7e6b5c2..789e92c 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -139,9 +139,9 @@ F9XMODEXT = @F9XMODEXT@
 F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
-FCFLAGS = @FCFLAGS@
+FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
 FCLIBS = @FCLIBS@
-FFLAGS = @FFLAGS@ @H5_FFLAGS@
+FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
 FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@
 FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@
@@ -149,7 +149,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_FFLAGS = @H5_FFLAGS@
+H5_FCFLAGS = @H5_FCFLAGS@
 H5_VERSION = @H5_VERSION@
 HADDR_T = @HADDR_T@
 HDF5_INTERFACES = @HDF5_INTERFACES@
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index c8cf161..812180c 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -170,9 +170,9 @@ F9XMODEXT = @F9XMODEXT@
 F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
-FCFLAGS = @FCFLAGS@
+FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
 FCLIBS = @FCLIBS@
-FFLAGS = @FFLAGS@ @H5_FFLAGS@
+FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
 FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@
 FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@
@@ -180,7 +180,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_FFLAGS = @H5_FFLAGS@
+H5_FCFLAGS = @H5_FCFLAGS@
 H5_VERSION = @H5_VERSION@
 HADDR_T = @HADDR_T@
 HDF5_INTERFACES = @HDF5_INTERFACES@
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 133bcca..5920559 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -163,9 +163,9 @@ F9XMODEXT = @F9XMODEXT@
 F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
-FCFLAGS = @FCFLAGS@
+FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
 FCLIBS = @FCLIBS@
-FFLAGS = @FFLAGS@ @H5_FFLAGS@
+FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
 FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@
 FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@
@@ -173,7 +173,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_FFLAGS = @H5_FFLAGS@
+H5_FCFLAGS = @H5_FCFLAGS@
 H5_VERSION = @H5_VERSION@
 HADDR_T = @HADDR_T@
 HDF5_INTERFACES = @HDF5_INTERFACES@
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 678d170..99b7adf 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -163,9 +163,9 @@ F9XMODEXT = @F9XMODEXT@
 F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
-FCFLAGS = @FCFLAGS@
+FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
 FCLIBS = @FCLIBS@
-FFLAGS = @FFLAGS@ @H5_FFLAGS@
+FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
 FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@
 FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@
@@ -173,7 +173,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_FFLAGS = @H5_FFLAGS@
+H5_FCFLAGS = @H5_FCFLAGS@
 H5_VERSION = @H5_VERSION@
 HADDR_T = @HADDR_T@
 HDF5_INTERFACES = @HDF5_INTERFACES@
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 27104f3..085d62c 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -174,9 +174,9 @@ F9XMODEXT = @F9XMODEXT@
 F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
-FCFLAGS = @FCFLAGS@
+FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
 FCLIBS = @FCLIBS@
-FFLAGS = @FFLAGS@ @H5_FFLAGS@
+FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
 FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@
 FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@
@@ -184,7 +184,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_FFLAGS = @H5_FFLAGS@
+H5_FCFLAGS = @H5_FCFLAGS@
 H5_VERSION = @H5_VERSION@
 HADDR_T = @HADDR_T@
 HDF5_INTERFACES = @HDF5_INTERFACES@
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index ef78bc6..176e27b 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -156,9 +156,9 @@ F9XMODEXT = @F9XMODEXT@
 F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
-FCFLAGS = @FCFLAGS@
+FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
 FCLIBS = @FCLIBS@
-FFLAGS = @FFLAGS@ @H5_FFLAGS@
+FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
 FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@
 FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@
@@ -166,7 +166,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_FFLAGS = @H5_FFLAGS@
+H5_FCFLAGS = @H5_FCFLAGS@
 H5_VERSION = @H5_VERSION@
 HADDR_T = @HADDR_T@
 HDF5_INTERFACES = @HDF5_INTERFACES@
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index d833475..2a120dc 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -178,9 +178,9 @@ F9XMODEXT = @F9XMODEXT@
 F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
-FCFLAGS = @FCFLAGS@
+FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
 FCLIBS = @FCLIBS@
-FFLAGS = @FFLAGS@ @H5_FFLAGS@
+FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
 FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@
 FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@
@@ -188,7 +188,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_FFLAGS = @H5_FFLAGS@
+H5_FCFLAGS = @H5_FCFLAGS@
 H5_VERSION = @H5_VERSION@
 HADDR_T = @HADDR_T@
 HDF5_INTERFACES = @HDF5_INTERFACES@
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index be4892d..ade8647 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -160,9 +160,9 @@ F9XMODEXT = @F9XMODEXT@
 F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
-FCFLAGS = @FCFLAGS@
+FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
 FCLIBS = @FCLIBS@
-FFLAGS = @FFLAGS@ @H5_FFLAGS@
+FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
 FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@
 FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@
@@ -170,7 +170,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_FFLAGS = @H5_FFLAGS@
+H5_FCFLAGS = @H5_FCFLAGS@
 H5_VERSION = @H5_VERSION@
 HADDR_T = @HADDR_T@
 HDF5_INTERFACES = @HDF5_INTERFACES@
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index f498a83..82e4dde 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -181,9 +181,9 @@ F9XMODEXT = @F9XMODEXT@
 F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
-FCFLAGS = @FCFLAGS@
+FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
 FCLIBS = @FCLIBS@
-FFLAGS = @FFLAGS@ @H5_FFLAGS@
+FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
 FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@
 FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@
@@ -191,7 +191,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_FFLAGS = @H5_FFLAGS@
+H5_FCFLAGS = @H5_FCFLAGS@
 H5_VERSION = @H5_VERSION@
 HADDR_T = @HADDR_T@
 HDF5_INTERFACES = @HDF5_INTERFACES@