diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-02-01 16:40:20 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-02-01 16:40:20 +0100 |
| commit | 91ff0172972fdc3b858d6272b653f70a5650b067 (patch) | |
| tree | 181b1fb38fff3e466167d8431b6c23a77e76a73e /configure.cmake | |
| parent | a96fbc3c352dad89c6007672eedf437e0516abe0 (diff) | |
| parent | 8cf1f50967ff58abb7d9688ae64ac662e66389c0 (diff) | |
| download | mariadb-git-91ff0172972fdc3b858d6272b653f70a5650b067.tar.gz | |
Merge MDEV-9112 into 10.1
Conflicts:
config.h.cmake
configure.cmake
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.cmake b/configure.cmake index 43996c6a909..d59029df14a 100644 --- a/configure.cmake +++ b/configure.cmake @@ -1067,6 +1067,9 @@ CHECK_STRUCT_HAS_MEMBER("struct dirent" d_ino "dirent.h" STRUCT_DIRENT_HAS_D_IN CHECK_STRUCT_HAS_MEMBER("struct dirent" d_namlen "dirent.h" STRUCT_DIRENT_HAS_D_NAMLEN) SET(SPRINTF_RETURNS_INT 1) CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_H) +IF(NOT HAVE_UCONTEXT_H) + CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_H) +ENDIF() CHECK_STRUCT_HAS_MEMBER("struct timespec" tv_sec "time.h" STRUCT_TIMESPEC_HAS_TV_SEC) CHECK_STRUCT_HAS_MEMBER("struct timespec" tv_nsec "time.h" STRUCT_TIMESPEC_HAS_TV_NSEC) |