diff options
| author | James Laird <jlaird@hdfgroup.org> | 2006-04-21 19:21:24 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2006-04-21 19:21:24 (GMT) |
| commit | 91e56dc68db9b37fb536bac555e95953ba240ac2 (patch) | |
| tree | 55140e8a869ac834886f90f94dd805ff4be2fd08 /hl/tools | |
| parent | 5eb6bc4dfebffadaa6de112b66f43e20bad9d0c5 (diff) | |
| download | hdf5-91e56dc68db9b37fb536bac555e95953ba240ac2.zip hdf5-91e56dc68db9b37fb536bac555e95953ba240ac2.tar.gz hdf5-91e56dc68db9b37fb536bac555e95953ba240ac2.tar.bz2 | |
[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)
Diffstat (limited to 'hl/tools')
| -rw-r--r-- | hl/tools/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/tools/gif2h5/Makefile.in | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index ec5ccb9..140039a 100644 --- a/hl/tools/Makefile.in +++ b/hl/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/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 61875e4..7b4f65f 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -165,9 +165,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@ @@ -175,7 +175,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@ |