diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2011-10-12 16:46:15 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2011-10-12 16:46:15 (GMT) |
commit | 3aa1b1d93cad549d092eba87826d207a5f04051b (patch) | |
tree | 1170db55d90874f6ba9ab9823a63ad6dd82804ed /configure.in | |
parent | 21b235a43a0ddf6855eecb760bd9a9a6c0d0817e (diff) | |
download | hdf5-3aa1b1d93cad549d092eba87826d207a5f04051b.zip hdf5-3aa1b1d93cad549d092eba87826d207a5f04051b.tar.gz hdf5-3aa1b1d93cad549d092eba87826d207a5f04051b.tar.bz2 |
[svn-r21528] Merge of 21517 and 21520 from trunk:
- Added checks for clock_gettime() to configure.in.
Tested on Linux, FreeBSD, Solaris, MacOSX to ensure they are found correctly and everything builds. No code currently reliess on clock_gettime().
- Brought Windows and VMS H5pubconf.h files into sync with the Linux file. Some data sizes were corrected in both VMS and Windows.
Tested on Windows. Ray will test on VMS when this is pushed to the 1.8.x branch.
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 71f6c88..6d4e8f7 100644 --- a/configure.in +++ b/configure.in @@ -1355,11 +1355,14 @@ AC_HEADER_STDC AC_HEADER_TIME dnl ---------------------------------------------------------------------- -dnl Check for these two functions before <sys/time.h> is checked for, otherwise -dnl they are not detected correctly on Solaris [2.6]. +dnl Check for these two functions before the time headers are checked +dnl for, otherwise they are not detected correctly on Solaris (the +dnl configure test will fail due to multiply-defined symbols). dnl AC_CHECK_FUNCS(difftime) AC_CHECK_FUNCS(gettimeofday, [have_gettime="yes"], [have_gettime="no"]) +AC_SEARCH_LIBS([clock_gettime], [rt posix4]) +AC_CHECK_FUNCS([clock_gettime],[have_clock_gettime="yes"],[have_clock_gettime="no"]) dnl Unix AC_CHECK_HEADERS([sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h]) @@ -2122,6 +2125,12 @@ if test "X$THREADSAFE" = "Xyes"; then fi dnl ---------------------------------------------------------------------- +dnl Check for MONOTONIC_TIMER support (used in clock_gettime). This has +dnl to be done after any POSIX/BSD defines to ensure that the test gets +dnl the correct POSIX level on linux. +AC_CHECK_DECL(CLOCK_MONOTONIC,[have_clock_monotonic="yes"],[have_clock_monotonic="no"],[[#include <time.h>]]) + +dnl ---------------------------------------------------------------------- dnl How does one figure out the local time zone? Anyone know of a dnl Posix way to do this? dnl |