diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2010-07-09 02:52:14 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2010-07-09 02:52:14 (GMT) |
| commit | 10a8b060ca69eafe2eb73e86e7ed56432a2650d5 (patch) | |
| tree | 9fb057c2a785fdd7691fb69322368602ff4e2ba5 /src | |
| parent | 5d5ffe2373f1f5db3e49da5095466c94d16dca19 (diff) | |
| download | hdf5-10a8b060ca69eafe2eb73e86e7ed56432a2650d5.zip hdf5-10a8b060ca69eafe2eb73e86e7ed56432a2650d5.tar.gz hdf5-10a8b060ca69eafe2eb73e86e7ed56432a2650d5.tar.bz2 | |
[svn-r19059] Brought changes from hdf5_1_8 to add version information for fortran and c++ compilers in libhdf5.settings file and configure output (r18836), to install examples as part of make install (r18680), and to provide scripts to compile and run the examples after they are installed (r18817).
Tested with new/h5committest on amani, heiwa, and jam.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 2 | ||||
| -rw-r--r-- | src/libhdf5.settings.in | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 4c6bad2..61cf6ab 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -220,6 +220,7 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXX_VERSION = @CXX_VERSION@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ DEFAULT_API_VERSION = @DEFAULT_API_VERSION@ @@ -245,6 +246,7 @@ FC = @FC@ FCFLAGS = @FCFLAGS@ FCFLAGS_f90 = @FCFLAGS_f90@ FCLIBS = @FCLIBS@ +FC_VERSION = @FC_VERSION@ FGREP = @FGREP@ FILTERS = @FILTERS@ FSEARCH_DIRS = @FSEARCH_DIRS@ diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in index ba233e8..2e8bc52 100644 --- a/src/libhdf5.settings.in +++ b/src/libhdf5.settings.in @@ -37,12 +37,12 @@ Compiling Options: Languages: ---------- Fortran: @HDF_FORTRAN@ -@BUILD_FORTRAN_CONDITIONAL_TRUE@ Fortran Compiler: @FC@ +@BUILD_FORTRAN_CONDITIONAL_TRUE@ Fortran Compiler: @FC_VERSION@ @BUILD_FORTRAN_CONDITIONAL_TRUE@ Fortran Flags: @FCFLAGS@ @BUILD_FORTRAN_CONDITIONAL_TRUE@ H5 Fortran Flags: @H5_FCFLAGS@ @BUILD_FORTRAN_CONDITIONAL_TRUE@ AM Fortran Flags: @AM_FCFLAGS@ C++: @HDF_CXX@ -@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: @CXX@ +@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: @CXX_VERSION@ @BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags: @CXXFLAGS@ @BUILD_CXX_CONDITIONAL_TRUE@ H5 C++ Flags: @H5_CXXFLAGS@ @BUILD_CXX_CONDITIONAL_TRUE@ AM C++ Flags: @AM_CXXFLAGS@ |