diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2011-04-15 20:41:32 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2011-04-15 20:41:32 (GMT) |
| commit | 699098014b590a5e39df37d92e7d36139741fd0c (patch) | |
| tree | 718ccce06ac3dde4c295e8d325bcc28baf8ed537 /src/libhdf5.settings.in | |
| parent | e59c147f5d647e1fdec51a96fc5ebe8754c2c73f (diff) | |
| download | hdf5-699098014b590a5e39df37d92e7d36139741fd0c.zip hdf5-699098014b590a5e39df37d92e7d36139741fd0c.tar.gz hdf5-699098014b590a5e39df37d92e7d36139741fd0c.tar.bz2 | |
[svn-r20525] Description:
Merge revisions 20475, 20502, and 20504 from trunk to 1.8 branch.
Tested:
Tested on jam, fred, bangan (CYGWIN), and h5committested.
Diffstat (limited to 'src/libhdf5.settings.in')
| -rw-r--r-- | src/libhdf5.settings.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in index 169fa16..46d19a7 100644 --- a/src/libhdf5.settings.in +++ b/src/libhdf5.settings.in @@ -23,10 +23,11 @@ Compiling Options: CPPFLAGS: @CPPFLAGS@ H5_CPPFLAGS: @H5_CPPFLAGS@ AM_CPPFLAGS: @AM_CPPFLAGS@ - Shared Libraries: @enable_shared@ - Static Libraries: @enable_static@ + Shared C Library: @enable_shared@ + Static C Library: @enable_static@ Statically Linked Executables: @STATIC_EXEC@ LDFLAGS: @LDFLAGS@ + H5_LDFLAGS: @H5_LDFLAGS@ AM_LDFLAGS: @AM_LDFLAGS@ Extra libraries: @LIBS@ Archiver: @AR@ @@ -41,11 +42,16 @@ Languages: @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@ +@BUILD_FORTRAN_CONDITIONAL_TRUE@ Shared Fortran Library: @H5_FORTRAN_SHARED@ +@BUILD_FORTRAN_CONDITIONAL_TRUE@ Static Fortran Library: @enable_static@ + C++: @HDF_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@ +@BUILD_CXX_CONDITIONAL_TRUE@ Shared C++ Library: @H5_CXX_SHARED@ +@BUILD_CXX_CONDITIONAL_TRUE@ Static C++ Library: @enable_static@ Features: --------- |