diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-06 14:50:50 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-06 14:50:50 +0100 |
| commit | 4771ae4b22d2bdef0aafc563570c71d4636a2493 (patch) | |
| tree | d115bd7c68b1e6feab68ff6fcd547e0c86c79296 /configure.cmake | |
| parent | 60f51af755ea9d07c20a596ba21de184816fa265 (diff) | |
| parent | 0c25e58db6b045df92c209d396031cac5b528bbf (diff) | |
| download | mariadb-git-4771ae4b22d2bdef0aafc563570c71d4636a2493.tar.gz | |
Merge branch 'github/10.1' into 10.2
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake index ffcb9ba83b9..21701209696 100644 --- a/configure.cmake +++ b/configure.cmake @@ -329,6 +329,7 @@ CHECK_FUNCTION_EXISTS (cuserid HAVE_CUSERID) CHECK_FUNCTION_EXISTS (ftruncate HAVE_FTRUNCATE) CHECK_FUNCTION_EXISTS (compress HAVE_COMPRESS) CHECK_FUNCTION_EXISTS (crypt HAVE_CRYPT) +CHECK_FUNCTION_EXISTS (dladdr HAVE_DLADDR) CHECK_FUNCTION_EXISTS (dlerror HAVE_DLERROR) CHECK_FUNCTION_EXISTS (dlopen HAVE_DLOPEN) CHECK_FUNCTION_EXISTS (fchmod HAVE_FCHMOD) @@ -379,7 +380,6 @@ CHECK_FUNCTION_EXISTS (pthread_rwlock_rdlock HAVE_PTHREAD_RWLOCK_RDLOCK) CHECK_FUNCTION_EXISTS (pthread_sigmask HAVE_PTHREAD_SIGMASK) CHECK_FUNCTION_EXISTS (pthread_yield_np HAVE_PTHREAD_YIELD_NP) CHECK_FUNCTION_EXISTS (putenv HAVE_PUTENV) -CHECK_FUNCTION_EXISTS (readdir_r HAVE_READDIR_R) CHECK_FUNCTION_EXISTS (readlink HAVE_READLINK) CHECK_FUNCTION_EXISTS (realpath HAVE_REALPATH) CHECK_FUNCTION_EXISTS (rename HAVE_RENAME) @@ -416,6 +416,16 @@ IF(HAVE_SYS_EVENT_H) CHECK_FUNCTION_EXISTS (kqueue HAVE_KQUEUE) ENDIF() +# readdir_r might exist, but be marked deprecated +SET(CMAKE_REQUIRED_FLAGS -Werror) +CHECK_CXX_SOURCE_COMPILES( +"#include <dirent.h> +int main() { + readdir_r(0,0,0); + return 0; + }" HAVE_READDIR_R) +SET(CMAKE_REQUIRED_FLAGS) + #-------------------------------------------------------------------- # Support for WL#2373 (Use cycle counter for timing) #-------------------------------------------------------------------- |