diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-04-30 22:02:27 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-04-30 22:02:27 (GMT) |
| commit | a4553b35e1e2dae2e5f99cfd2286b1c89f84b43d (patch) | |
| tree | 34bb4b6df999a88fc43f7f56bc80e7e1c7876532 /src | |
| parent | 0801609ac2acba1b221f5cc29623d6d58eee97d8 (diff) | |
| parent | f80019dfda61ba42c189277dc16643648e23553d (diff) | |
| download | hdf5-a4553b35e1e2dae2e5f99cfd2286b1c89f84b43d.zip hdf5-a4553b35e1e2dae2e5f99cfd2286b1c89f84b43d.tar.gz hdf5-a4553b35e1e2dae2e5f99cfd2286b1c89f84b43d.tar.bz2 | |
Merge pull request #2556 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_8 to hdf5_1_8
* commit 'f80019dfda61ba42c189277dc16643648e23553d':
Update config/gnu-cxxflags.
Update to use optimization flags, C++ error flags, and correct libhdf5.settings.in to remove unworkable changes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 2 | ||||
| -rw-r--r-- | src/libhdf5.settings.in | 39 |
2 files changed, 16 insertions, 25 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index ad20965..d8858e5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -550,6 +550,7 @@ DEFAULT_API_VERSION = @DEFAULT_API_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@ +DEV_WARNINGS = @DEV_WARNINGS@ DIRECT_VFD = @DIRECT_VFD@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ @@ -578,6 +579,7 @@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ H5_ECFLAGS = @H5_ECFLAGS@ +H5_ECXXFLAGS = @H5_ECXXFLAGS@ H5_FCFLAGS = @H5_FCFLAGS@ H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@ H5_LDFLAGS = @H5_LDFLAGS@ diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in index b6e7221..5ce30e5 100644 --- a/src/libhdf5.settings.in +++ b/src/libhdf5.settings.in @@ -6,7 +6,7 @@ General Information: HDF5 Version: @H5_VERSION@ Configured on: @CONFIG_DATE@ Configured by: @CONFIG_USER@ - Configure mode: @CONFIG_MODE@ + Configure mode: @CONFIG_MODE@ Host system: @host_cpu@-@host_vendor@-@host_os@ Uname information: @UNAME_INFO@ Byte sex: @BYTESEX@ @@ -14,36 +14,25 @@ General Information: Compiling Options: ------------------ - Build Mode: @BUILD_MODE@ - Debugging Symbols: @SYMBOLS@ - Asserts: @ASSERTS@ - Profiling: @PROFILING@ - Optimization Level: @OPTIMIZATION@ - -Linking Options: ----------------- - Libraries: @STATIC_SHARED@ - Statically Linked Executables: @LT_STATIC_EXEC@ - LDFLAGS: @LDFLAGS@ - H5_LDFLAGS: @H5_LDFLAGS@ - AM_LDFLAGS: @AM_LDFLAGS@ - Extra libraries: @LIBS@ - Archiver: @AR@ - AR_FLAGS: @AR_FLAGS@ - Ranlib: @RANLIB@ - -Languages: ----------- - C: yes + Compilation Mode: @CONFIG_MODE@ C Compiler: @CC_VERSION@ - CPPFLAGS: @CPPFLAGS@ - H5_CPPFLAGS: @H5_CPPFLAGS@ - AM_CPPFLAGS: @AM_CPPFLAGS@ C Flags: @CFLAGS@ H5 C Flags: @H5_CFLAGS@ @H5_ECFLAGS@ AM C Flags: @AM_CFLAGS@ + CPPFLAGS: @CPPFLAGS@ + H5_CPPFLAGS: @H5_CPPFLAGS@ + AM_CPPFLAGS: @AM_CPPFLAGS@ 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@ + Ranlib: @RANLIB@ + Debugged Packages: @DEBUG_PKG@ + API Tracing: @TRACE_API@ Languages: ---------- |