diff options
author | Vailin Choi <vchoi@hdfgroup.org> | 2013-04-12 22:36:34 (GMT) |
---|---|---|
committer | Vailin Choi <vchoi@hdfgroup.org> | 2013-04-12 22:36:34 (GMT) |
commit | 94f89911545edce6fc9ebde2c83357cbda0bbd70 (patch) | |
tree | ea81574cb50d78ff04256ec1ca42c959249e4498 /config | |
parent | 4ce17c9aa6515c32551104516b32caf8b0ce9f02 (diff) | |
download | hdf5-94f89911545edce6fc9ebde2c83357cbda0bbd70.zip hdf5-94f89911545edce6fc9ebde2c83357cbda0bbd70.tar.gz hdf5-94f89911545edce6fc9ebde2c83357cbda0bbd70.tar.bz2 |
[svn-r23582] Bring revisions 22708:22730 from trunk to revise_chunks.
h5committested.
Diffstat (limited to 'config')
-rw-r--r-- | config/cmake/ConfigureChecks.cmake | 5 | ||||
-rw-r--r-- | config/lt_vers.am | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index 0940418..4f4f759 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -413,6 +413,7 @@ CHECK_INCLUDE_FILE_CONCAT ("netinet/in.h" H5_HAVE_NETINET_IN_H) # The linux-lfs option is deprecated. SET (LINUX_LFS 0) +SET (HDF5_EXTRA_C_FLAGS) SET (HDF5_EXTRA_FLAGS) IF (NOT WINDOWS) # Linux Specific flags @@ -422,7 +423,9 @@ IF (NOT WINDOWS) # correctly. # POSIX feature information can be found in the gcc manual at: # http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html - SET (HDF5_EXTRA_FLAGS -D_POSIX_C_SOURCE=199506L -D_BSD_SOURCE) + SET (HDF5_EXTRA_C_FLAGS -D_POSIX_C_SOURCE=199506L) + SET (HDF5_EXTRA_FLAGS -D_BSD_SOURCE) + OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON) IF (HDF5_ENABLE_LARGE_FILE) SET (msg "Performing TEST_LFS_WORKS") diff --git a/config/lt_vers.am b/config/lt_vers.am index 34fa390..9abc39d 100644 --- a/config/lt_vers.am +++ b/config/lt_vers.am @@ -17,7 +17,7 @@ # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 117 +LT_VERS_REVISION = 121 LT_VERS_AGE = 0 ## If the API changes *at all*, increment LT_VERS_INTERFACE and |