diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 09:40:39 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 09:40:39 +0200 |
| commit | df563e0c037f9b2cdb22e145575f92a121b4b529 (patch) | |
| tree | 31d39796cebcef916eb7e0888537c18f946170ff /configure.cmake | |
| parent | e058a251c10350f3727ca1df022dc5786933535b (diff) | |
| parent | bdfe2784d5b73a1fdcdacb3d9adcc9dc71af344b (diff) | |
| download | mariadb-git-df563e0c037f9b2cdb22e145575f92a121b4b529.tar.gz | |
Merge 10.2 into 10.3
main.derived_cond_pushdown: Move all 10.3 tests to the end,
trim trailing white space, and add an "End of 10.3 tests" marker.
Add --sorted_result to tests where the ordering is not deterministic.
main.win_percentile: Add --sorted_result to tests where the
ordering is no longer deterministic.
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/configure.cmake b/configure.cmake index d840dd4e565..42ba2496105 100644 --- a/configure.cmake +++ b/configure.cmake @@ -986,11 +986,14 @@ CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6" sin6_len SET(CMAKE_EXTRA_INCLUDE_FILES) -CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_H) -IF(NOT HAVE_UCONTEXT_H) - CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_H) +CHECK_STRUCT_HAS_MEMBER("struct dirent" d_ino "dirent.h" STRUCT_DIRENT_HAS_D_INO) +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_FILE_UCONTEXT_H) +IF(NOT HAVE_FILE_UCONTEXT_H) + CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_FILE_UCONTEXT_H) ENDIF() -IF(HAVE_UCONTEXT_H) +IF(HAVE_FILE_UCONTEXT_H) CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H) ENDIF() |