cmake: remove unused checks, options, and symbols

16 files changed, 38 insertions, 327 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 881c705849b..3ef10407c24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,12 +40,6 @@ MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
-# Distinguish between community and non-community builds, with the
-# default being a community build. This does not impact the feature
-# set that will be compiled in; it's merely provided as a hint to
-# custom packaging steps.
-OPTION(COMMUNITY_BUILD "Set to true if this is a community build" ON) 
-
 # Use a default manufacturer if no manufacturer was identified.
 IF(NOT DEFINED MANUFACTURER) 
   SET(MANUFACTURER "Built from Source" CACHE  STRING
@@ -170,13 +164,11 @@ IF(DISABLE_SHARED)
   SET(WITHOUT_DYNAMIC_PLUGINS 1)
 ENDIF()
 OPTION(ENABLED_PROFILING "Enable profiling" ON)
-OPTION(CYBOZU "" OFF)
 OPTION(WITHOUT_SERVER "Build only the client library and clients" OFF)
 IF(UNIX)
   OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
 ENDIF()
 OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON)
-MARK_AS_ADVANCED(CYBOZU)
 
 OPTION(NOT_FOR_DISTRIBUTION "Allow linking with GPLv2-incompatible system libraries. Only set it you never plan to distribute the resulting binaries" OFF)
 
diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake
index 07a8085a411..e8c46c1888a 100644
--- a/cmake/os/WindowsCache.cmake
+++ b/cmake/os/WindowsCache.cmake
@@ -22,8 +22,6 @@
 IF(MSVC)
 SET(BFD_H_EXISTS 0 CACHE INTERNAL "")
 SET(HAVE_ACCESS 1 CACHE  INTERNAL "")
-SET(HAVE_AIO_H CACHE  INTERNAL "")
-SET(HAVE_AIO_READ CACHE  INTERNAL "")
 SET(HAVE_ALARM CACHE  INTERNAL "")
 SET(HAVE_ALLOCA_H CACHE  INTERNAL "")
 SET(HAVE_ARPA_INET_H CACHE  INTERNAL "")
@@ -32,56 +30,41 @@ SET(HAVE_BACKTRACE CACHE  INTERNAL "")
 SET(HAVE_BACKTRACE_SYMBOLS CACHE  INTERNAL "")
 SET(HAVE_BACKTRACE_SYMBOLS_FD CACHE  INTERNAL "")
 SET(HAVE_BFILL CACHE  INTERNAL "")
-SET(HAVE_BMOVE CACHE  INTERNAL "")
 SET(HAVE_BSD_SIGNALS CACHE  INTERNAL "")
-SET(HAVE_BSEARCH 1 CACHE  INTERNAL "")
 SET(HAVE_BSS_START CACHE  INTERNAL "")
-SET(HAVE_BZERO CACHE  INTERNAL "")
-SET(HAVE_CHOWN CACHE  INTERNAL "")
 SET(HAVE_CLOCK_GETTIME CACHE  INTERNAL "")
 SET(HAVE_COMPRESS CACHE  INTERNAL "")
 SET(HAVE_CRYPT CACHE  INTERNAL "")
 SET(HAVE_CRYPT_H CACHE  INTERNAL "")
 SET(HAVE_CUSERID CACHE  INTERNAL "")
-SET(HAVE_CXX_NEW 1 CACHE  INTERNAL "")
 SET(HAVE_DECL_MADVISE CACHE  INTERNAL "")
-SET(HAVE_DIRECTIO CACHE  INTERNAL "")
 SET(HAVE_DIRENT_H CACHE  INTERNAL "")
 SET(HAVE_DLERROR CACHE  INTERNAL "")
 SET(HAVE_DLFCN_H CACHE  INTERNAL "")
 SET(HAVE_DLOPEN CACHE  INTERNAL "")
-SET(HAVE_DOPRNT CACHE  INTERNAL "")
 SET(HAVE_EXECINFO_H CACHE  INTERNAL "")
 SET(HAVE_FCHMOD CACHE  INTERNAL "")
 SET(HAVE_FCNTL CACHE  INTERNAL "")
 SET(HAVE_FCNTL_H 1 CACHE  INTERNAL "")
 SET(HAVE_FCNTL_NONBLOCK CACHE  INTERNAL "")
-SET(HAVE_FCONVERT CACHE  INTERNAL "")
 SET(HAVE_FDATASYNC CACHE  INTERNAL "")
 SET(HAVE_DECL_FDATASYNC CACHE INTERNAL "")
 SET(HAVE_FEDISABLEEXCEPT CACHE INTERNAL "")
 SET(HAVE_FENV_H CACHE  INTERNAL "")
 SET(HAVE_FESETROUND CACHE  INTERNAL "")
-SET(HAVE_FGETLN CACHE  INTERNAL "")
 SET(HAVE_FINITE CACHE  INTERNAL "")
 SET(HAVE_FINITE_IN_MATH_H CACHE  INTERNAL "")
-SET(HAVE_FLOATINGPOINT_H CACHE  INTERNAL "")
 SET(HAVE_FLOAT_H 1 CACHE  INTERNAL "")
-SET(HAVE_FLOCKFILE CACHE  INTERNAL "")
 SET(HAVE_FNMATCH_H CACHE  INTERNAL "")
-SET(HAVE_FPSETMASK CACHE  INTERNAL "")
 SET(HAVE_FPU_CONTROL_H CACHE  INTERNAL "")
 SET(HAVE_FSEEKO CACHE  INTERNAL "")
 SET(HAVE_FSYNC CACHE  INTERNAL "")
 SET(HAVE_FTIME 1 CACHE  INTERNAL "")
 SET(HAVE_FTRUNCATE CACHE  INTERNAL "")
-SET(HAVE_GETADDRINFO 1 CACHE  INTERNAL "")
 SET(HAVE_GETIFADDRS CACHE  INTERNAL "")
 SET(HAVE_GETCWD 1 CACHE  INTERNAL "")
 SET(HAVE_GETHOSTBYADDR_R CACHE  INTERNAL "")
 SET(HAVE_GETHRTIME CACHE  INTERNAL "")
-SET(HAVE_GETLINE CACHE  INTERNAL "")
-SET(HAVE_GETNAMEINFO CACHE  INTERNAL "")
 SET(HAVE_GETPAGESIZE CACHE  INTERNAL "")
 SET(HAVE_GETPASS CACHE  INTERNAL "")
 SET(HAVE_GETPASSPHRASE CACHE  INTERNAL "")
@@ -102,18 +85,12 @@ SET(HAVE_IPPROTO_IPV6 CACHE  INTERNAL "")
 SET(HAVE_IPV6 TRUE CACHE  INTERNAL "")
 SET(HAVE_IPV6_V6ONLY 1 CACHE  INTERNAL "")
 SET(HAVE_ISINF CACHE  INTERNAL "")
-SET(HAVE_ISSETUGID CACHE  INTERNAL "")
-SET(HAVE_GETUID CACHE  INTERNAL "")
-SET(HAVE_GETEUID CACHE  INTERNAL "")
-SET(HAVE_GETGID CACHE  INTERNAL "")
-SET(HAVE_GETEGID CACHE  INTERNAL "")
 SET(HAVE_LANGINFO_H CACHE  INTERNAL "")
 SET(HAVE_LDIV 1 CACHE  INTERNAL "")
 SET(HAVE_LIMITS_H 1 CACHE  INTERNAL "")
 SET(HAVE_LOCALE_H 1 CACHE  INTERNAL "")
 SET(HAVE_LOCALTIME_R 1 CACHE  INTERNAL "")
 SET(HAVE_LOG2 CACHE  INTERNAL "")
-SET(HAVE_LONGJMP 1 CACHE  INTERNAL "")
 SET(HAVE_LRAND48 CACHE  INTERNAL "")
 SET(HAVE_LSTAT CACHE  INTERNAL "")
 SET(HAVE_MADVISE CACHE  INTERNAL "")
@@ -141,8 +118,6 @@ SET(HAVE_PAM_APPL_H CACHE INTERNAL "")
 SET(HAVE_POLL_H CACHE  INTERNAL "")
 SET(HAVE_POPEN CACHE  INTERNAL "")
 SET(HAVE_POLL CACHE INTERNAL "")
-SET(HAVE_PORT_CREATE CACHE  INTERNAL "")
-SET(HAVE_PORT_H CACHE  INTERNAL "")
 SET(HAVE_POSIX_FALLOCATE CACHE  INTERNAL "")
 SET(HAVE_POSIX_SIGNALS CACHE  INTERNAL "")
 SET(HAVE_PREAD CACHE  INTERNAL "")
@@ -152,12 +127,10 @@ SET(HAVE_PTHREAD_ATTR_GETSTACKSIZE CACHE  INTERNAL "")
 SET(HAVE_PTHREAD_ATTR_SETSCOPE CACHE  INTERNAL "")
 SET(HAVE_PTHREAD_ATTR_SETSTACKSIZE CACHE  INTERNAL "")
 SET(HAVE_PTHREAD_CONDATTR_CREATE CACHE  INTERNAL "")
-SET(HAVE_PTHREAD_CONDATTR_SETCLOCK CACHE  INTERNAL "")
 SET(HAVE_PTHREAD_INIT CACHE  INTERNAL "")
 SET(HAVE_PTHREAD_KEY_DELETE CACHE  INTERNAL "")
 SET(HAVE_PTHREAD_RWLOCK_RDLOCK CACHE  INTERNAL "")
 SET(HAVE_PTHREAD_SIGMASK CACHE  INTERNAL "")
-SET(HAVE_PTHREAD_THREADMASK CACHE  INTERNAL "")
 SET(HAVE_PTHREAD_YIELD_NP CACHE  INTERNAL "")
 SET(HAVE_PTHREAD_YIELD_ZERO_ARG CACHE  INTERNAL "")
 SET(HAVE_PUTENV 1 CACHE  INTERNAL "")
@@ -167,27 +140,16 @@ SET(HAVE_READDIR_R CACHE  INTERNAL "")
 SET(HAVE_READLINK CACHE  INTERNAL "")
 SET(HAVE_READ_REAL_TIME CACHE  INTERNAL "")
 SET(HAVE_REALPATH CACHE  INTERNAL "")
-SET(HAVE_REGCOMP CACHE  INTERNAL "")
 SET(HAVE_RENAME 1 CACHE  INTERNAL "")
-SET(HAVE_RE_COMP CACHE  INTERNAL "")
 SET(HAVE_RINT CACHE  INTERNAL "")
 SET(HAVE_RWLOCK_INIT CACHE  INTERNAL "")
 SET(HAVE_SCHED_H CACHE  INTERNAL "")
 SET(HAVE_SCHED_YIELD CACHE  INTERNAL "")
 SET(HAVE_SELECT 1 CACHE  INTERNAL "")
 SET(HAVE_SELECT_H CACHE  INTERNAL "")
-SET(HAVE_SEMAPHORE_H CACHE  INTERNAL "")
 SET(HAVE_SETENV CACHE  INTERNAL "")
-SET(HAVE_SETFD CACHE  INTERNAL "")
 SET(HAVE_SETLOCALE 1 CACHE  INTERNAL "")
-SET(HAVE_SHMAT CACHE  INTERNAL "")
-SET(HAVE_SHMCTL CACHE  INTERNAL "")
-SET(HAVE_SHMDT CACHE  INTERNAL "")
-SET(HAVE_SHMGET CACHE  INTERNAL "")
 SET(HAVE_SIGACTION CACHE  INTERNAL "")
-SET(HAVE_SIGADDSET CACHE  INTERNAL "")
-SET(HAVE_SIGEMPTYSET CACHE  INTERNAL "")
-SET(HAVE_SIGHOLD CACHE  INTERNAL "")
 SET(HAVE_SIGINT 1 CACHE  INTERNAL "")
 SET(HAVE_SIGPIPE CACHE  INTERNAL "")
 SET(HAVE_SIGQUIT CACHE  INTERNAL "")
@@ -195,9 +157,6 @@ SET(HAVE_SIGSET CACHE  INTERNAL "")
 SET(HAVE_SIGTERM 1 CACHE  INTERNAL "")
 SET(HAVE_SIGTHREADMASK CACHE  INTERNAL "")
 SET(HAVE_SIGWAIT CACHE  INTERNAL "")
-SET(HAVE_SIZEOF_BOOL FALSE CACHE  INTERNAL "")
-SET(HAVE_SIZEOF_CHAR TRUE CACHE  INTERNAL "")
-SET(SIZEOF_CHAR 1 CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_CHARP TRUE CACHE  INTERNAL "")
 SET(SIZEOF_CHARP ${CMAKE_SIZEOF_VOID_P} CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_IN6_ADDR TRUE CACHE  INTERNAL "")
@@ -214,13 +173,10 @@ SET(SIZEOF_LONG_LONG 8 CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_MODE_T FALSE CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_OFF_T TRUE CACHE  INTERNAL "")
 SET(SIZEOF_OFF_T 4 CACHE  INTERNAL "")
-SET(HAVE_SIZEOF_SHORT TRUE CACHE  INTERNAL "")
-SET(SIZEOF_SHORT 2 CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_SIGSET_T FALSE CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_SIZE_T TRUE CACHE  INTERNAL "")
 SET(SIZEOF_SIZE_T ${CMAKE_SIZEOF_VOID_P} CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_SOCKADDR_IN6 TRUE CACHE  INTERNAL "")
-SET(HAVE_SIZEOF_SOCKLEN_T FALSE CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_UCHAR FALSE CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_UINT FALSE CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_UINT16 FALSE CACHE  INTERNAL "")
@@ -228,7 +184,6 @@ SET(HAVE_SIZEOF_UINT32 FALSE CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_UINT64 FALSE CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_UINT8 FALSE CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_ULONG FALSE CACHE  INTERNAL "")
-SET(HAVE_SIZEOF_U_INT32_T FALSE CACHE  INTERNAL "")
 SET(HAVE_SIZE_OF_SSIZE_T FALSE CACHE  INTERNAL "")
 SET(HAVE_SLEEP CACHE  INTERNAL "")
 SET(HAVE_SOCKADDR_STORAGE_SS_FAMILY 1 CACHE  INTERNAL "")
@@ -241,30 +196,20 @@ SET(HAVE_STDLIB_H 1 CACHE  INTERNAL "")
 SET(HAVE_STPCPY CACHE  INTERNAL "")
 SET(HAVE_STRCASECMP CACHE  INTERNAL "")
 SET(HAVE_STRCOLL 1 CACHE  INTERNAL "")
-SET(HAVE_STRDUP 1 CACHE  INTERNAL "")
 SET(HAVE_STRERROR 1 CACHE  INTERNAL "")
 SET(HAVE_STRINGS_H CACHE  INTERNAL "")
 SET(HAVE_STRING_H 1 CACHE  INTERNAL "")
-SET(HAVE_STRLCAT CACHE  INTERNAL "")
-SET(HAVE_STRLCPY CACHE  INTERNAL "")
-SET(HAVE_STRNCASECMP CACHE  INTERNAL "")
 SET(HAVE_STRNDUP CACHE  INTERNAL "")
 IF(MSVC_VERSION GREATER 1310)
 SET(HAVE_STRNLEN 1 CACHE  INTERNAL "")
 ENDIF()
 SET(HAVE_STRPBRK 1 CACHE  INTERNAL "")
-SET(HAVE_STRSEP CACHE  INTERNAL "")
-SET(HAVE_STRSIGNAL CACHE  INTERNAL "")
-SET(HAVE_STRSTR 1 CACHE  INTERNAL "")
 SET(HAVE_STRTOK_R CACHE  INTERNAL "")
-SET(HAVE_STRTOL 1 CACHE  INTERNAL "")
 SET(HAVE_STRTOLL CACHE  INTERNAL "")
 SET(HAVE_STRTOUL 1 CACHE  INTERNAL "")
 SET(HAVE_STRTOULL CACHE  INTERNAL "")
-SET(HAVE_SVR3_SIGNALS CACHE  INTERNAL "")
 SET(HAVE_SYNCH_H CACHE  INTERNAL "")
 SET(HAVE_SYSENT_H CACHE  INTERNAL "")
-SET(HAVE_SYS_CDEFS_H CACHE  INTERNAL "")
 SET(HAVE_SYS_DIR_H CACHE  INTERNAL "")
 SET(HAVE_SYS_EVENT_H CACHE  INTERNAL "")
 SET(HAVE_SYS_ERRLIST CACHE  INTERNAL "")
@@ -285,7 +230,6 @@ SET(HAVE_SYS_SOCKIO_H CACHE INTERNAL "")
 SET(HAVE_SYS_SOCKET_H CACHE  INTERNAL "")
 SET(HAVE_SYS_STAT_H 1 CACHE  INTERNAL "")
 SET(HAVE_SYS_STREAM_H CACHE  INTERNAL "")
-SET(HAVE_SYS_TERMCAP_H CACHE  INTERNAL "")
 SET(HAVE_SYS_TIMEB_H 1 CACHE  INTERNAL "")
 SET(HAVE_SYS_TIMES_H CACHE  INTERNAL "")
 SET(HAVE_SYS_TIME_H CACHE  INTERNAL "")
@@ -310,10 +254,8 @@ SET(HAVE_TIME_H 1 CACHE  INTERNAL "")
 SET(HAVE_TZNAME 1 CACHE  INTERNAL "")
 SET(HAVE_UNISTD_H CACHE  INTERNAL "")
 SET(HAVE_UTIME_H CACHE  INTERNAL "")
-SET(HAVE_VALLOC CACHE  INTERNAL "")
 SET(HAVE_VARARGS_H 1 CACHE  INTERNAL "")
 SET(HAVE_VASPRINTF CACHE  INTERNAL "")
-SET(HAVE_VPRINTF 1 CACHE  INTERNAL "")
 IF(MSVC_VERSION GREATER 1310)
 SET(HAVE_VSNPRINTF 1 CACHE  INTERNAL "")
 ENDIF()
@@ -334,9 +276,6 @@ IF(MSVC_VERSION GREATER 1310)
  SET(HAVE_strtok_s 1 CACHE  INTERNAL "")
 ENDIF()
 SET(STDC_HEADERS CACHE 1 INTERNAL "")
-SET(STRUCT_DIRENT_HAS_D_INO CACHE INTERNAL "")
-SET(STRUCT_DIRENT_HAS_D_INO CACHE INTERNAL "")
-SET(STRUCT_DIRENT_HAS_D_NAMLEN CACHE INTERNAL "")
 SET(TIME_WITH_SYS_TIME CACHE INTERNAL "")
 SET(TIME_T_UNSIGNED 1 CACHE INTERNAL "")
 SET(TIOCSTAT_IN_SYS_IOCTL CACHE INTERNAL "")
@@ -354,18 +293,16 @@ SET(HAVE_SYS_NDIR_H CACHE INTERNAL "")
 SET(HAVE_SYS_NDIR_H CACHE INTERNAL "")
 SET(HAVE_ASM_TERMBITS_H CACHE INTERNAL "")
 SET(HAVE_TERMBITS_H CACHE INTERNAL "")
-SET(HAVE_VIS_H CACHE INTERNAL "")
 SET(HAVE_WCHAR_H 1 CACHE INTERNAL "")
 SET(HAVE_WCTYPE_H 1 CACHE INTERNAL "")
 SET(HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP CACHE INTERNAL "")
 SET(HAVE_SOCKADDR_IN_SIN_LEN CACHE INTERNAL "")
 SET(HAVE_SOCKADDR_IN6_SIN6_LEN CACHE INTERNAL "")
-SET(HAVE_VALGRIND CACHE INTERNAL "")
+SET(HAVE_VALGRIND_MEMCHECK_H CACHE INTERNAL "")
 SET(HAVE_EVENT_H CACHE INTERNAL "")
 SET(HAVE_LINUX_UNISTD_H CACHE INTERNAL "")
 SET(HAVE_SYS_UTSNAME_H CACHE INTERNAL "")
 SET(HAVE_PTHREAD_ATTR_GETGUARDSIZE CACHE INTERNAL "")
-SET(HAVE_UCONTEXT_H CACHE INTERNAL "")
 SET(HAVE_SOCKPEERCRED CACHE INTERNAL "")
 SET(HAVE_ABI_CXA_DEMANGLE CACHE INTERNAL "")
 SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "")
diff --git a/cmake/readline.cmake b/cmake/readline.cmake
index f570c91c1b5..1bd669fd605 100644
--- a/cmake/readline.cmake
+++ b/cmake/readline.cmake
@@ -27,25 +27,11 @@ MACRO (MYSQL_CHECK_MULTIBYTE)
       SET(HAVE_MBSTATE_T 1)
     ENDIF()
   ENDIF()
-
-  CHECK_C_SOURCE_COMPILES("
-  #include <langinfo.h>
-  int main(int ac, char **av)
-  {
-    char *cs = nl_langinfo(CODESET);
-    return 0;
-  }"
-  HAVE_LANGINFO_CODESET)
   
   CHECK_FUNCTION_EXISTS(mbrlen HAVE_MBRLEN)
-  CHECK_FUNCTION_EXISTS(mbscmp HAVE_MBSCMP)
   CHECK_FUNCTION_EXISTS(mbsrtowcs HAVE_MBSRTOWCS)
-  CHECK_FUNCTION_EXISTS(wcrtomb HAVE_WCRTOMB)
   CHECK_FUNCTION_EXISTS(mbrtowc HAVE_MBRTOWC)
-  CHECK_FUNCTION_EXISTS(wcscoll HAVE_WCSCOLL)
-  CHECK_FUNCTION_EXISTS(wcsdup HAVE_WCSDUP)
   CHECK_FUNCTION_EXISTS(wcwidth HAVE_WCWIDTH)
-  CHECK_FUNCTION_EXISTS(wctype HAVE_WCTYPE)
   CHECK_FUNCTION_EXISTS(iswlower HAVE_ISWLOWER)
   CHECK_FUNCTION_EXISTS(iswupper HAVE_ISWUPPER)
   CHECK_FUNCTION_EXISTS(towlower HAVE_TOWLOWER)
@@ -60,13 +46,7 @@ MACRO (MYSQL_CHECK_MULTIBYTE)
 
   SET(CMAKE_EXTRA_INCLUDE_FILES wctype.h)
   CHECK_TYPE_SIZE(wctype_t SIZEOF_WCTYPE_T)
-  IF(SIZEOF_WCTYPE_T)
-    SET(HAVE_WCTYPE_T 1)
-  ENDIF()
   CHECK_TYPE_SIZE(wint_t SIZEOF_WINT_T)
-  IF(SIZEOF_WINT_T)
-    SET(HAVE_WINT_T 1)
-  ENDIF()
   SET(CMAKE_EXTRA_INCLUDE_FILES)
 
 ENDMACRO()
@@ -87,15 +67,12 @@ MACRO (FIND_CURSES)
 
  IF(CURSES_HAVE_CURSES_H)
    SET(HAVE_CURSES_H 1 CACHE INTERNAL "")
- ELSEIF(CURSES_HAVE_NCURSES_H)
-   SET(HAVE_NCURSES_H 1 CACHE INTERNAL "")
  ENDIF()
  IF(CMAKE_SYSTEM_NAME MATCHES "HP")
    # CMake uses full path to library /lib/libcurses.sl 
    # On Itanium, it results into architecture mismatch+
    # the library is for  PA-RISC
    SET(CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
-   SET(CURSES_CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
  ENDIF()
 
  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
diff --git a/config.h.cmake b/config.h.cmake
index cc54511e360..a04815bf0a2 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -20,15 +20,12 @@
 #cmakedefine STDC_HEADERS 1
 #cmakedefine _GNU_SOURCE 1
 #cmakedefine HAVE_ALLOCA_H 1
-#cmakedefine HAVE_AIO_H 1
 #cmakedefine HAVE_ARPA_INET_H 1
 #cmakedefine HAVE_ASM_MSR_H 1
 #cmakedefine HAVE_ASM_TERMBITS_H 1
-#cmakedefine HAVE_BSEARCH 1
 #cmakedefine HAVE_CRYPT_H 1
 #cmakedefine HAVE_CURSES_H 1
 #cmakedefine HAVE_BFD_H 1
-#cmakedefine HAVE_NCURSES_H 1
 #cmakedefine HAVE_NDIR_H 1
 #cmakedefine HAVE_DIRENT_H 1
 #cmakedefine HAVE_DLFCN_H 1
@@ -36,7 +33,6 @@
 #cmakedefine HAVE_FCNTL_H 1
 #cmakedefine HAVE_FENV_H 1
 #cmakedefine HAVE_FLOAT_H 1
-#cmakedefine HAVE_FLOATINGPOINT_H 1
 #cmakedefine HAVE_FNMATCH_H 1
 #cmakedefine HAVE_FPU_CONTROL_H 1
 #cmakedefine HAVE_GRP_H 1
@@ -53,7 +49,6 @@
 #cmakedefine HAVE_NETINET_IN_H 1
 #cmakedefine HAVE_PATHS_H 1
 #cmakedefine HAVE_POLL_H 1
-#cmakedefine HAVE_PORT_H 1
 #cmakedefine HAVE_PWD_H 1
 #cmakedefine HAVE_SCHED_H 1
 #cmakedefine HAVE_SELECT_H 1
@@ -64,11 +59,9 @@
 #cmakedefine HAVE_STRINGS_H 1
 #cmakedefine HAVE_STRING_H 1
 #cmakedefine HAVE_STDINT_H 1
-#cmakedefine HAVE_SEMAPHORE_H 1
 #cmakedefine HAVE_SYNCH_H 1
 #cmakedefine HAVE_SYSENT_H 1
 #cmakedefine HAVE_SYS_DIR_H 1
-#cmakedefine HAVE_SYS_CDEFS_H 1
 #cmakedefine HAVE_SYS_FILE_H 1
 #cmakedefine HAVE_SYS_FPU_H 1
 #cmakedefine HAVE_SYS_IOCTL_H 1
@@ -88,7 +81,6 @@
 #cmakedefine HAVE_SYS_STAT_H 1
 #cmakedefine HAVE_SYS_STREAM_H 1
 #cmakedefine HAVE_SYS_SYSCALL_H 1
-#cmakedefine HAVE_SYS_TERMCAP_H 1
 #cmakedefine HAVE_SYS_TIMEB_H 1
 #cmakedefine HAVE_SYS_TIMES_H 1
 #cmakedefine HAVE_SYS_TIME_H 1
@@ -105,20 +97,11 @@
 #cmakedefine HAVE_UNISTD_H 1
 #cmakedefine HAVE_UTIME_H 1
 #cmakedefine HAVE_VARARGS_H 1
-#cmakedefine HAVE_VIS_H 1
 #cmakedefine HAVE_SYS_UTIME_H 1
 #cmakedefine HAVE_SYS_WAIT_H 1
 #cmakedefine HAVE_SYS_PARAM_H 1
 
 /* Libraries */
-#cmakedefine HAVE_LIBPTHREAD 1
-#cmakedefine HAVE_LIBM 1
-#cmakedefine HAVE_LIBDL 1
-#cmakedefine HAVE_LIBRT 1
-#cmakedefine HAVE_LIBSOCKET 1
-#cmakedefine HAVE_LIBNSL 1
-#cmakedefine HAVE_LIBCRYPT 1
-#cmakedefine HAVE_LIBMTMALLOC 1
 #cmakedefine HAVE_LIBWRAP 1
 #cmakedefine HAVE_SYSTEMD 1
 /* Does "struct timespec" have a "sec" and "nsec" field? */
@@ -135,43 +118,33 @@
 #cmakedefine FIONREAD_IN_SYS_FILIO 1
 
 /* Functions we may want to use. */
+#cmakedefine HAVE_ACCEPT4 1
 #cmakedefine HAVE_ACCESS 1
 #cmakedefine HAVE_AIOWAIT 1
 #cmakedefine HAVE_ALARM 1
 #cmakedefine HAVE_ALLOCA 1
 #cmakedefine HAVE_BFILL 1
-#cmakedefine HAVE_BMOVE 1
-#cmakedefine HAVE_BZERO 1
 #cmakedefine HAVE_INDEX 1
-#cmakedefine HAVE_CHOWN 1
 #cmakedefine HAVE_CLOCK_GETTIME 1
 #cmakedefine HAVE_CRYPT 1
 #cmakedefine HAVE_CUSERID 1
-#cmakedefine HAVE_CXX_NEW 1
-#cmakedefine HAVE_DIRECTIO 1
 #cmakedefine HAVE_DLERROR 1
 #cmakedefine HAVE_DLOPEN 1
-#cmakedefine HAVE_DOPRNT 1
 #cmakedefine HAVE_FCHMOD 1
 #cmakedefine HAVE_FCNTL 1
-#cmakedefine HAVE_FCONVERT 1
 #cmakedefine HAVE_FDATASYNC 1
 #cmakedefine HAVE_DECL_FDATASYNC 1
 #cmakedefine HAVE_FEDISABLEEXCEPT 1
 #cmakedefine HAVE_FESETROUND 1
 #cmakedefine HAVE_FINITE 1
 #cmakedefine HAVE_FP_EXCEPT 1
-#cmakedefine HAVE_FPSETMASK 1
 #cmakedefine HAVE_FSEEKO 1
 #cmakedefine HAVE_FSYNC 1
 #cmakedefine HAVE_FTIME 1
-#cmakedefine HAVE_GETADDRINFO 1
 #cmakedefine HAVE_GETIFADDRS 1
 #cmakedefine HAVE_GETCWD 1
 #cmakedefine HAVE_GETHOSTBYADDR_R 1
 #cmakedefine HAVE_GETHRTIME 1
-#cmakedefine HAVE_GETLINE 1
-#cmakedefine HAVE_GETNAMEINFO 1
 #cmakedefine HAVE_GETPAGESIZE 1
 #cmakedefine HAVE_GETPASS 1
 #cmakedefine HAVE_GETPASSPHRASE 1
@@ -185,11 +158,6 @@
 #cmakedefine gmtime_r @gmtime_r@
 #cmakedefine HAVE_IN_ADDR_T 1
 #cmakedefine HAVE_INITGROUPS 1
-#cmakedefine HAVE_ISSETUGID 1
-#cmakedefine HAVE_GETUID 1
-#cmakedefine HAVE_GETEUID 1
-#cmakedefine HAVE_GETGID 1
-#cmakedefine HAVE_GETEGID 1
 #cmakedefine HAVE_ISNAN 1
 #cmakedefine HAVE_ISINF 1
 #cmakedefine HAVE_LARGE_PAGE_OPTION 1
@@ -197,7 +165,6 @@
 #cmakedefine HAVE_LRAND48 1
 #cmakedefine HAVE_LOCALTIME_R 1
 #cmakedefine HAVE_LOG2 1
-#cmakedefine HAVE_LONGJMP 1
 #cmakedefine HAVE_LSTAT 1
 #cmakedefine HAVE_MEMALIGN 1
 /* #cmakedefine HAVE_MLOCK 1 see Bug#54662 */
@@ -205,7 +172,6 @@
 #cmakedefine HAVE_NL_LANGINFO 1
 #cmakedefine HAVE_MADVISE 1
 #cmakedefine HAVE_DECL_MADVISE 1
-#cmakedefine HAVE_DECL_TGOTO 1
 #cmakedefine HAVE_DECL_MHA_MAPSIZE_VA 1
 #cmakedefine HAVE_MALLINFO 1
 #cmakedefine HAVE_MEMCPY 1
@@ -216,10 +182,8 @@
 #cmakedefine HAVE_MMAP64 1
 #cmakedefine HAVE_PERROR 1
 #cmakedefine HAVE_POLL 1
-#cmakedefine HAVE_PORT_CREATE 1
 #cmakedefine HAVE_POSIX_FALLOCATE 1
 #cmakedefine HAVE_LINUX_FALLOC_H 1
-#cmakedefine HAVE_FALLOCATE 1
 #cmakedefine HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE 1
 #cmakedefine HAVE_PREAD 1
 #cmakedefine HAVE_PAUSE_INSTRUCTION 1
@@ -229,26 +193,17 @@
 #cmakedefine HAVE_PTHREAD_ATTR_CREATE 1
 #cmakedefine HAVE_PTHREAD_ATTR_GETGUARDSIZE 1
 #cmakedefine HAVE_PTHREAD_ATTR_GETSTACKSIZE 1
-#cmakedefine HAVE_PTHREAD_ATTR_SETPRIO 1
-#cmakedefine HAVE_PTHREAD_ATTR_SETSCHEDPARAM 1
 #cmakedefine HAVE_PTHREAD_ATTR_SETSCOPE 1
 #cmakedefine HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
 #cmakedefine HAVE_PTHREAD_CONDATTR_CREATE 1
-#cmakedefine HAVE_PTHREAD_CONDATTR_SETCLOCK 1
-#cmakedefine HAVE_PTHREAD_KEY_DELETE 1
 #cmakedefine HAVE_PTHREAD_KEY_DELETE 1
 #cmakedefine HAVE_PTHREAD_KILL 1
 #cmakedefine HAVE_PTHREAD_RWLOCK_RDLOCK 1
-#cmakedefine HAVE_PTHREAD_SETPRIO_NP 1
-#cmakedefine HAVE_PTHREAD_SETSCHEDPARAM 1
 #cmakedefine HAVE_PTHREAD_SIGMASK 1
-#cmakedefine HAVE_PTHREAD_THREADMASK 1
 #cmakedefine HAVE_PTHREAD_YIELD_NP 1
 #cmakedefine HAVE_PTHREAD_YIELD_ZERO_ARG 1
 #cmakedefine PTHREAD_ONCE_INITIALIZER @PTHREAD_ONCE_INITIALIZER@
 #cmakedefine HAVE_PUTENV 1
-#cmakedefine HAVE_RE_COMP 1
-#cmakedefine HAVE_REGCOMP 1
 #cmakedefine HAVE_READDIR_R 1
 #cmakedefine HAVE_READLINK 1
 #cmakedefine HAVE_REALPATH 1
@@ -257,15 +212,10 @@
 #cmakedefine HAVE_RWLOCK_INIT 1
 #cmakedefine HAVE_SCHED_YIELD 1
 #cmakedefine HAVE_SELECT 1
-#cmakedefine HAVE_SETFD 1
 #cmakedefine HAVE_SETENV 1
 #cmakedefine HAVE_SETLOCALE 1
 #cmakedefine HAVE_SETUPTERM 1
-#cmakedefine HAVE_SIGADDSET 1
-#cmakedefine HAVE_SIGEMPTYSET 1
-#cmakedefine HAVE_SIGHOLD 1
 #cmakedefine HAVE_SIGSET 1
-#cmakedefine HAVE_SIGSET_T 1
 #cmakedefine HAVE_SIGACTION 1
 #cmakedefine HAVE_SIGTHREADMASK 1
 #cmakedefine HAVE_SIGWAIT 1
@@ -274,23 +224,12 @@
 #cmakedefine HAVE_STPCPY 1
 #cmakedefine HAVE_STRERROR 1
 #cmakedefine HAVE_STRCOLL 1
-#cmakedefine HAVE_STRSIGNAL 1
-#cmakedefine HAVE_STRLCPY 1
-#cmakedefine HAVE_STRLCAT 1
-#cmakedefine HAVE_FGETLN 1
 #cmakedefine HAVE_STRNLEN 1
 #cmakedefine HAVE_STRPBRK 1
-#cmakedefine HAVE_STRSEP 1
-#cmakedefine HAVE_STRSTR 1
 #cmakedefine HAVE_STRTOK_R 1
-#cmakedefine HAVE_STRTOL 1
 #cmakedefine HAVE_STRTOLL 1
 #cmakedefine HAVE_STRTOUL 1
 #cmakedefine HAVE_STRTOULL 1
-#cmakedefine HAVE_SHMAT 1
-#cmakedefine HAVE_SHMCTL 1
-#cmakedefine HAVE_SHMDT 1
-#cmakedefine HAVE_SHMGET 1
 #cmakedefine HAVE_TELL 1
 #cmakedefine HAVE_TEMPNAM 1
 #cmakedefine HAVE_THR_SETCONCURRENCY 1
@@ -298,15 +237,12 @@
 #cmakedefine HAVE_TIME 1
 #cmakedefine HAVE_TIMES 1
 #cmakedefine HAVE_UCONTEXT 1
-#cmakedefine HAVE_VALLOC 1
 #cmakedefine HAVE_VIDATTR 1
 #define HAVE_VIO_READ_BUFF 1
 #cmakedefine HAVE_VASPRINTF 1
-#cmakedefine HAVE_VPRINTF 1
 #cmakedefine HAVE_VSNPRINTF 1
 #cmakedefine HAVE_FTRUNCATE 1
 #cmakedefine HAVE_TZNAME 1
-#cmakedefine HAVE_AIO_READ 1
 /* Symbols we may use */
 #cmakedefine HAVE_SYS_ERRLIST 1
 /* used by stacktrace functions */
@@ -315,25 +251,18 @@
 #cmakedefine HAVE_BACKTRACE_SYMBOLS 1
 #cmakedefine HAVE_BACKTRACE_SYMBOLS_FD 1
 #cmakedefine HAVE_PRINTSTACK 1
-#cmakedefine HAVE_STRUCT_SOCKADDR_IN6 1
-#cmakedefine HAVE_STRUCT_IN6_ADDR 1
-#cmakedefine HAVE_NETINET_IN6_H 1
 #cmakedefine HAVE_IPV6 1
 #cmakedefine ss_family @ss_family@
 #cmakedefine HAVE_SOCKADDR_IN_SIN_LEN 1
 #cmakedefine HAVE_SOCKADDR_IN6_SIN6_LEN 1
-#cmakedefine HAVE_TIMESPEC_TS_SEC 1
-#cmakedefine STRUCT_DIRENT_HAS_D_INO 1
-#cmakedefine STRUCT_DIRENT_HAS_D_NAMLEN 1
 #cmakedefine STRUCT_TIMESPEC_HAS_TV_SEC 1
 #cmakedefine STRUCT_TIMESPEC_HAS_TV_NSEC 1
-#cmakedefine SPRINTF_RETURNS_INT 1
 
 #define USE_MB 1
 #define USE_MB_IDENT 1
 
 /* this means that valgrind headers and macros are available */
-#cmakedefine HAVE_VALGRIND 1
+#cmakedefine HAVE_VALGRIND_MEMCHECK_H 1
 
 /* this means WITH_VALGRIND - we change some code paths for valgrind */
 #cmakedefine HAVE_valgrind 1
@@ -360,21 +289,14 @@
 #cmakedefine SIZEOF_SIZE_T @SIZEOF_CHARP@
 #endif
 
-#cmakedefine SIZEOF_CHAR @SIZEOF_CHAR@
-#define HAVE_CHAR 1
 #define HAVE_LONG 1
 #define HAVE_CHARP 1
-#cmakedefine SIZEOF_SHORT @SIZEOF_SHORT@
-#define HAVE_SHORT 1
 #cmakedefine SIZEOF_INT @SIZEOF_INT@
 #define HAVE_INT 1
 #cmakedefine SIZEOF_LONG_LONG @SIZEOF_LONG_LONG@
 #cmakedefine HAVE_LONG_LONG 1
 #cmakedefine SIZEOF_OFF_T @SIZEOF_OFF_T@
 #cmakedefine HAVE_OFF_T 1
-#cmakedefine SIZEOF_SIGSET_T @SIZEOF_SIGSET_T@
-#cmakedefine HAVE_SIGSET_T 1
-#cmakedefine HAVE_SIZE_T 1
 #cmakedefine SIZEOF_UCHAR @SIZEOF_UCHAR@
 #cmakedefine HAVE_UCHAR 1
 #cmakedefine SIZEOF_UINT @SIZEOF_UINT@
@@ -393,14 +315,10 @@
 #cmakedefine HAVE_INT32 1
 #cmakedefine SIZEOF_UINT32 @SIZEOF_UINT32@
 #cmakedefine HAVE_UINT32 1
-#cmakedefine SIZEOF_U_INT32_T @SIZEOF_U_INT32_T@
-#cmakedefine HAVE_U_INT32_T 1
 #cmakedefine SIZEOF_INT64 @SIZEOF_INT64@
 #cmakedefine HAVE_INT64 1
 #cmakedefine SIZEOF_UINT64 @SIZEOF_UINT64@
 #cmakedefine HAVE_UINT64 1
-#cmakedefine SIZEOF_BOOL @SIZEOF_BOOL@
-#cmakedefine HAVE_BOOL 1
 
 #cmakedefine SOCKET_SIZE_TYPE @SOCKET_SIZE_TYPE@
 
@@ -411,7 +329,6 @@
 #cmakedefine QSORT_TYPE_IS_VOID 1
 #cmakedefine RETQSORTTYPE @RETQSORTTYPE@
 
-#cmakedefine SIGNAL_RETURN_TYPE_IS_VOID 1
 #cmakedefine RETSIGTYPE @RETSIGTYPE@
 #cmakedefine VOID_SIGHANDLER 1
 #define STRUCT_RLIMIT struct rlimit
@@ -440,30 +357,19 @@
 #cmakedefine HAVE_WCHAR_H 1
 #cmakedefine HAVE_LANGINFO_H 1
 #cmakedefine HAVE_MBRLEN 1
-#cmakedefine HAVE_MBSCMP 1
 #cmakedefine HAVE_MBSRTOWCS 1
-#cmakedefine HAVE_WCRTOMB 1
 #cmakedefine HAVE_MBRTOWC 1
-#cmakedefine HAVE_WCSCOLL 1
-#cmakedefine HAVE_WCSDUP 1
 #cmakedefine HAVE_WCWIDTH 1
-#cmakedefine HAVE_WCTYPE 1
 #cmakedefine HAVE_ISWLOWER 1
 #cmakedefine HAVE_ISWUPPER 1
 #cmakedefine HAVE_TOWLOWER 1
 #cmakedefine HAVE_TOWUPPER 1
 #cmakedefine HAVE_ISWCTYPE 1
 #cmakedefine HAVE_WCHAR_T 1
-#cmakedefine HAVE_WCTYPE_T 1
-#cmakedefine HAVE_WINT_T 1
 
 
 #cmakedefine HAVE_STRCASECMP 1
-#cmakedefine HAVE_STRNCASECMP 1
-#cmakedefine HAVE_STRDUP 1
-#cmakedefine HAVE_LANGINFO_CODESET  1
 #cmakedefine HAVE_TCGETATTR 1
-#cmakedefine HAVE_FLOCKFILE 1
 
 #cmakedefine HAVE_WEAK_SYMBOL 1
 #cmakedefine HAVE_ABI_CXA_DEMANGLE 1
@@ -471,8 +377,6 @@
 
 #cmakedefine HAVE_POSIX_SIGNALS 1
 #cmakedefine HAVE_BSD_SIGNALS 1
-#cmakedefine HAVE_SVR3_SIGNALS 1
-#cmakedefine HAVE_V7_SIGNALS 1
 
 
 #cmakedefine HAVE_SOLARIS_STYLE_GETHOST 1
@@ -545,7 +449,6 @@
 #cmakedefine ENABLED_LOCAL_INFILE 1
 #cmakedefine ENABLED_PROFILING 1
 #cmakedefine EXTRA_DEBUG 1
-#cmakedefine CYBOZU 1
 #cmakedefine USE_SYMDIR 1
 
 /* Character sets and collations */
@@ -554,7 +457,6 @@
 
 #cmakedefine USE_MB 1
 #cmakedefine USE_MB_IDENT 1
-#cmakedefine USE_STRCOLL 1
 
 /* This should mean case insensitive file system */
 #cmakedefine FN_NO_CASE_SENSE 1
@@ -615,12 +517,8 @@
   Important storage engines (those that really need define 
   WITH_<ENGINE>_STORAGE_ENGINE for the whole server)
 */
-#cmakedefine WITH_MYISAM_STORAGE_ENGINE 1
-#cmakedefine WITH_MYISAMMRG_STORAGE_ENGINE 1
-#cmakedefine WITH_HEAP_STORAGE_ENGINE 1
 #cmakedefine WITH_INNOBASE_STORAGE_ENGINE 1
 #cmakedefine WITH_XTRADB_STORAGE_ENGINE 1
-#cmakedefine WITH_CSV_STORAGE_ENGINE 1
 #cmakedefine WITH_PARTITION_STORAGE_ENGINE 1
 #cmakedefine WITH_PERFSCHEMA_STORAGE_ENGINE 1
 #cmakedefine WITH_ARIA_STORAGE_ENGINE 1
diff --git a/configure.cmake b/configure.cmake
index dba5a3bf79c..c9d2d4e0817 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -172,7 +172,6 @@ INCLUDE (CheckIncludeFileCXX)
 CHECK_INCLUDE_FILES ("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
 CHECK_INCLUDE_FILES (sys/types.h HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILES (alloca.h HAVE_ALLOCA_H)
-CHECK_INCLUDE_FILES (aio.h HAVE_AIO_H)
 CHECK_INCLUDE_FILES (arpa/inet.h HAVE_ARPA_INET_H)
 CHECK_INCLUDE_FILES (crypt.h HAVE_CRYPT_H)
 CHECK_INCLUDE_FILES (dirent.h HAVE_DIRENT_H)
@@ -181,7 +180,6 @@ CHECK_INCLUDE_FILES (execinfo.h HAVE_EXECINFO_H)
 CHECK_INCLUDE_FILES (fcntl.h HAVE_FCNTL_H)
 CHECK_INCLUDE_FILES (fenv.h HAVE_FENV_H)
 CHECK_INCLUDE_FILES (float.h HAVE_FLOAT_H)
-CHECK_INCLUDE_FILES (floatingpoint.h HAVE_FLOATINGPOINT_H)
 CHECK_INCLUDE_FILES (fpu_control.h HAVE_FPU_CONTROL_H)
 CHECK_INCLUDE_FILES (grp.h HAVE_GRP_H)
 CHECK_INCLUDE_FILES (ieeefp.h HAVE_IEEEFP_H)
@@ -197,12 +195,10 @@ CHECK_INCLUDE_FILES (memory.h HAVE_MEMORY_H)
 CHECK_INCLUDE_FILES (ndir.h HAVE_NDIR_H)
 CHECK_INCLUDE_FILES (netinet/in.h HAVE_NETINET_IN_H)
 CHECK_INCLUDE_FILES (paths.h HAVE_PATHS_H)
-CHECK_INCLUDE_FILES (port.h HAVE_PORT_H)
 CHECK_INCLUDE_FILES (poll.h HAVE_POLL_H)
 CHECK_INCLUDE_FILES (pwd.h HAVE_PWD_H)
 CHECK_INCLUDE_FILES (sched.h HAVE_SCHED_H)
 CHECK_INCLUDE_FILES (select.h HAVE_SELECT_H)
-CHECK_INCLUDE_FILES (semaphore.h HAVE_SEMAPHORE_H)
 CHECK_INCLUDE_FILES ("sys/types.h;sys/dir.h" HAVE_SYS_DIR_H)
 CHECK_INCLUDE_FILES ("sys/types.h;sys/event.h" HAVE_SYS_EVENT_H)
 CHECK_INCLUDE_FILES (sys/ndir.h HAVE_SYS_NDIR_H)
@@ -214,7 +210,6 @@ CHECK_INCLUDE_FILES (strings.h HAVE_STRINGS_H)
 CHECK_INCLUDE_FILES (string.h HAVE_STRING_H)
 CHECK_INCLUDE_FILES (synch.h HAVE_SYNCH_H)
 CHECK_INCLUDE_FILES (sysent.h HAVE_SYSENT_H)
-CHECK_INCLUDE_FILES (sys/cdefs.h HAVE_SYS_CDEFS_H)
 CHECK_INCLUDE_FILES (sys/file.h HAVE_SYS_FILE_H)
 CHECK_INCLUDE_FILES (sys/fpu.h HAVE_SYS_FPU_H)
 CHECK_INCLUDE_FILES (sys/ioctl.h HAVE_SYS_IOCTL_H)
@@ -229,7 +224,6 @@ CHECK_INCLUDE_FILES (sys/socket.h HAVE_SYS_SOCKET_H)
 CHECK_INCLUDE_FILES (sys/stat.h HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILES (sys/stream.h HAVE_SYS_STREAM_H)
 CHECK_INCLUDE_FILES (sys/syscall.h HAVE_SYS_SYSCALL_H)
-CHECK_INCLUDE_FILES (sys/termcap.h HAVE_SYS_TERMCAP_H)
 CHECK_INCLUDE_FILES ("curses.h;term.h" HAVE_TERM_H)
 CHECK_INCLUDE_FILES (asm/termbits.h HAVE_ASM_TERMBITS_H)
 CHECK_INCLUDE_FILES (termbits.h HAVE_TERMBITS_H)
@@ -247,7 +241,6 @@ CHECK_INCLUDE_FILES (sys/vadvise.h HAVE_SYS_VADVISE_H)
 CHECK_INCLUDE_FILES (fnmatch.h HAVE_FNMATCH_H)
 CHECK_INCLUDE_FILES (stdarg.h  HAVE_STDARG_H)
 CHECK_INCLUDE_FILES ("stdlib.h;sys/un.h" HAVE_SYS_UN_H)
-CHECK_INCLUDE_FILES (vis.h HAVE_VIS_H)
 CHECK_INCLUDE_FILES (wchar.h HAVE_WCHAR_H)
 CHECK_INCLUDE_FILES (wctype.h HAVE_WCTYPE_H)
 CHECK_INCLUDE_FILES (sys/sockio.h HAVE_SYS_SOCKIO_H)
@@ -323,7 +316,6 @@ ENDIF()
 CHECK_FUNCTION_EXISTS (accept4 HAVE_ACCEPT4)
 CHECK_FUNCTION_EXISTS (access HAVE_ACCESS)
 #CHECK_FUNCTION_EXISTS (aiowait HAVE_AIOWAIT)
-CHECK_FUNCTION_EXISTS (aio_read HAVE_AIO_READ)
 CHECK_FUNCTION_EXISTS (alarm HAVE_ALARM)
 SET(HAVE_ALLOCA 1)
 CHECK_FUNCTION_EXISTS (backtrace HAVE_BACKTRACE)
@@ -331,35 +323,25 @@ CHECK_FUNCTION_EXISTS (backtrace_symbols HAVE_BACKTRACE_SYMBOLS)
 CHECK_FUNCTION_EXISTS (backtrace_symbols_fd HAVE_BACKTRACE_SYMBOLS_FD)
 CHECK_FUNCTION_EXISTS (printstack HAVE_PRINTSTACK)
 CHECK_FUNCTION_EXISTS (bfill HAVE_BFILL)
-CHECK_FUNCTION_EXISTS (bmove HAVE_BMOVE)
-CHECK_FUNCTION_EXISTS (bsearch HAVE_BSEARCH)
 CHECK_FUNCTION_EXISTS (index HAVE_INDEX)
-CHECK_FUNCTION_EXISTS (bzero HAVE_BZERO)
 CHECK_FUNCTION_EXISTS (clock_gettime HAVE_CLOCK_GETTIME)
 CHECK_FUNCTION_EXISTS (cuserid HAVE_CUSERID)
-CHECK_FUNCTION_EXISTS (directio HAVE_DIRECTIO)
-CHECK_FUNCTION_EXISTS (_doprnt HAVE_DOPRNT)
-CHECK_FUNCTION_EXISTS (flockfile HAVE_FLOCKFILE)
 CHECK_FUNCTION_EXISTS (ftruncate HAVE_FTRUNCATE)
-CHECK_FUNCTION_EXISTS (getline HAVE_GETLINE)
 CHECK_FUNCTION_EXISTS (compress HAVE_COMPRESS)
 CHECK_FUNCTION_EXISTS (crypt HAVE_CRYPT)
 CHECK_FUNCTION_EXISTS (dlerror HAVE_DLERROR)
 CHECK_FUNCTION_EXISTS (dlopen HAVE_DLOPEN)
 CHECK_FUNCTION_EXISTS (fchmod HAVE_FCHMOD)
 CHECK_FUNCTION_EXISTS (fcntl HAVE_FCNTL)
-CHECK_FUNCTION_EXISTS (fconvert HAVE_FCONVERT)
 CHECK_FUNCTION_EXISTS (fdatasync HAVE_FDATASYNC)
 CHECK_SYMBOL_EXISTS(fdatasync "unistd.h" HAVE_DECL_FDATASYNC)
 CHECK_FUNCTION_EXISTS (fesetround HAVE_FESETROUND)
 CHECK_FUNCTION_EXISTS (fedisableexcept HAVE_FEDISABLEEXCEPT)
-CHECK_FUNCTION_EXISTS (fpsetmask HAVE_FPSETMASK)
 CHECK_FUNCTION_EXISTS (fseeko HAVE_FSEEKO)
 CHECK_FUNCTION_EXISTS (fsync HAVE_FSYNC)
 CHECK_FUNCTION_EXISTS (getcwd HAVE_GETCWD)
 CHECK_FUNCTION_EXISTS (gethostbyaddr_r HAVE_GETHOSTBYADDR_R)
 CHECK_FUNCTION_EXISTS (gethrtime HAVE_GETHRTIME)
-CHECK_FUNCTION_EXISTS (getnameinfo HAVE_GETNAMEINFO)
 CHECK_FUNCTION_EXISTS (getpass HAVE_GETPASS)
 CHECK_FUNCTION_EXISTS (getpassphrase HAVE_GETPASSPHRASE)
 CHECK_FUNCTION_EXISTS (getpwnam HAVE_GETPWNAM)
@@ -370,14 +352,8 @@ CHECK_FUNCTION_EXISTS (getrusage HAVE_GETRUSAGE)
 CHECK_FUNCTION_EXISTS (getwd HAVE_GETWD)
 CHECK_FUNCTION_EXISTS (gmtime_r HAVE_GMTIME_R)
 CHECK_FUNCTION_EXISTS (initgroups HAVE_INITGROUPS)
-CHECK_FUNCTION_EXISTS (issetugid HAVE_ISSETUGID)
-CHECK_FUNCTION_EXISTS (getuid HAVE_GETUID)
-CHECK_FUNCTION_EXISTS (geteuid HAVE_GETEUID)
-CHECK_FUNCTION_EXISTS (getgid HAVE_GETGID)
-CHECK_FUNCTION_EXISTS (getegid HAVE_GETEGID)
 CHECK_FUNCTION_EXISTS (ldiv HAVE_LDIV)
 CHECK_FUNCTION_EXISTS (localtime_r HAVE_LOCALTIME_R)
-CHECK_FUNCTION_EXISTS (longjmp HAVE_LONGJMP)
 CHECK_FUNCTION_EXISTS (lstat HAVE_LSTAT)
 CHECK_FUNCTION_EXISTS (madvise HAVE_MADVISE)
 CHECK_FUNCTION_EXISTS (mallinfo HAVE_MALLINFO)
@@ -390,9 +366,7 @@ CHECK_FUNCTION_EXISTS (mmap HAVE_MMAP)
 CHECK_FUNCTION_EXISTS (mmap64 HAVE_MMAP64)
 CHECK_FUNCTION_EXISTS (perror HAVE_PERROR)
 CHECK_FUNCTION_EXISTS (poll HAVE_POLL)
-CHECK_FUNCTION_EXISTS (port_create HAVE_PORT_CREATE)
 CHECK_FUNCTION_EXISTS (posix_fallocate HAVE_POSIX_FALLOCATE)
-CHECK_FUNCTION_EXISTS (fallocate HAVE_FALLOCATE)
 CHECK_FUNCTION_EXISTS (pread HAVE_PREAD)
 CHECK_FUNCTION_EXISTS (pthread_attr_create HAVE_PTHREAD_ATTR_CREATE)
 CHECK_FUNCTION_EXISTS (pthread_attr_getstacksize HAVE_PTHREAD_ATTR_GETSTACKSIZE)
@@ -400,65 +374,42 @@ CHECK_FUNCTION_EXISTS (pthread_attr_setscope HAVE_PTHREAD_ATTR_SETSCOPE)
 CHECK_FUNCTION_EXISTS (pthread_attr_getguardsize HAVE_PTHREAD_ATTR_GETGUARDSIZE)
 CHECK_FUNCTION_EXISTS (pthread_attr_setstacksize HAVE_PTHREAD_ATTR_SETSTACKSIZE)
 CHECK_FUNCTION_EXISTS (pthread_condattr_create HAVE_PTHREAD_CONDATTR_CREATE)
-CHECK_FUNCTION_EXISTS (pthread_condattr_setclock HAVE_PTHREAD_CONDATTR_SETCLOCK)
 CHECK_FUNCTION_EXISTS (pthread_key_delete HAVE_PTHREAD_KEY_DELETE)
 CHECK_FUNCTION_EXISTS (pthread_rwlock_rdlock HAVE_PTHREAD_RWLOCK_RDLOCK)
 CHECK_FUNCTION_EXISTS (pthread_sigmask HAVE_PTHREAD_SIGMASK)
-CHECK_FUNCTION_EXISTS (pthread_threadmask HAVE_PTHREAD_THREADMASK)
 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 (re_comp HAVE_RE_COMP)
-CHECK_FUNCTION_EXISTS (regcomp HAVE_REGCOMP)
 CHECK_FUNCTION_EXISTS (realpath HAVE_REALPATH)
 CHECK_FUNCTION_EXISTS (rename HAVE_RENAME)
 CHECK_FUNCTION_EXISTS (rwlock_init HAVE_RWLOCK_INIT)
 CHECK_FUNCTION_EXISTS (sched_yield HAVE_SCHED_YIELD)
 CHECK_FUNCTION_EXISTS (setenv HAVE_SETENV)
 CHECK_FUNCTION_EXISTS (setlocale HAVE_SETLOCALE)
-CHECK_FUNCTION_EXISTS (setfd HAVE_SETFD)
 CHECK_FUNCTION_EXISTS (sigaction HAVE_SIGACTION)
 CHECK_FUNCTION_EXISTS (sigthreadmask HAVE_SIGTHREADMASK)
 CHECK_FUNCTION_EXISTS (sigwait HAVE_SIGWAIT)
-CHECK_FUNCTION_EXISTS (sigaddset HAVE_SIGADDSET)
-CHECK_FUNCTION_EXISTS (sigemptyset HAVE_SIGEMPTYSET)
-CHECK_FUNCTION_EXISTS (sighold HAVE_SIGHOLD) 
 CHECK_FUNCTION_EXISTS (sigset HAVE_SIGSET)
 CHECK_FUNCTION_EXISTS (sleep HAVE_SLEEP)
 CHECK_FUNCTION_EXISTS (snprintf HAVE_SNPRINTF)
 CHECK_FUNCTION_EXISTS (stpcpy HAVE_STPCPY)
 CHECK_FUNCTION_EXISTS (strcoll HAVE_STRCOLL)
 CHECK_FUNCTION_EXISTS (strerror HAVE_STRERROR)
-CHECK_FUNCTION_EXISTS (strlcpy HAVE_STRLCPY)
 CHECK_FUNCTION_EXISTS (strnlen HAVE_STRNLEN)
-CHECK_FUNCTION_EXISTS (strlcat HAVE_STRLCAT)
-CHECK_FUNCTION_EXISTS (strsignal HAVE_STRSIGNAL)
-CHECK_FUNCTION_EXISTS (fgetln HAVE_FGETLN)
 CHECK_FUNCTION_EXISTS (strpbrk HAVE_STRPBRK)
-CHECK_FUNCTION_EXISTS (strstr HAVE_STRSTR)
 CHECK_FUNCTION_EXISTS (strtok_r HAVE_STRTOK_R)
-CHECK_FUNCTION_EXISTS (strtol HAVE_STRTOL)
 CHECK_FUNCTION_EXISTS (strtoll HAVE_STRTOLL)
 CHECK_FUNCTION_EXISTS (strtoul HAVE_STRTOUL)
 CHECK_FUNCTION_EXISTS (strtoull HAVE_STRTOULL)
 CHECK_FUNCTION_EXISTS (strcasecmp HAVE_STRCASECMP)
-CHECK_FUNCTION_EXISTS (strncasecmp HAVE_STRNCASECMP)
-CHECK_FUNCTION_EXISTS (strdup HAVE_STRDUP)
-CHECK_FUNCTION_EXISTS (shmat HAVE_SHMAT) 
-CHECK_FUNCTION_EXISTS (shmctl HAVE_SHMCTL)
-CHECK_FUNCTION_EXISTS (shmdt HAVE_SHMDT)
-CHECK_FUNCTION_EXISTS (shmget HAVE_SHMGET)
 CHECK_FUNCTION_EXISTS (tell HAVE_TELL)
 CHECK_FUNCTION_EXISTS (tempnam HAVE_TEMPNAM)
 CHECK_FUNCTION_EXISTS (thr_setconcurrency HAVE_THR_SETCONCURRENCY)
 CHECK_FUNCTION_EXISTS (thr_yield HAVE_THR_YIELD)
 CHECK_FUNCTION_EXISTS (vasprintf HAVE_VASPRINTF)
 CHECK_FUNCTION_EXISTS (vsnprintf HAVE_VSNPRINTF)
-CHECK_FUNCTION_EXISTS (vprintf HAVE_VPRINTF)
-CHECK_FUNCTION_EXISTS (valloc HAVE_VALLOC)
 CHECK_FUNCTION_EXISTS (memalign HAVE_MEMALIGN)
-CHECK_FUNCTION_EXISTS (chown HAVE_CHOWN)
 CHECK_FUNCTION_EXISTS (nl_langinfo HAVE_NL_LANGINFO)
 
 IF(HAVE_SYS_EVENT_H)
@@ -568,7 +519,6 @@ ENDIF(HAVE_STDINT_H)
 SET(HAVE_VOIDP 1)
 SET(HAVE_CHARP 1)
 SET(HAVE_LONG 1)
-SET(HAVE_SIZE_T 1)
 
 IF(NOT APPLE)
 MY_CHECK_TYPE_SIZE("void *" VOIDP)
@@ -577,7 +527,6 @@ MY_CHECK_TYPE_SIZE(long LONG)
 MY_CHECK_TYPE_SIZE(size_t SIZE_T)
 ENDIF()
 
-MY_CHECK_TYPE_SIZE(char CHAR)
 MY_CHECK_TYPE_SIZE(short SHORT)
 MY_CHECK_TYPE_SIZE(int INT)
 MY_CHECK_TYPE_SIZE("long long" LONG_LONG)
@@ -592,17 +541,14 @@ MY_CHECK_TYPE_SIZE(int16 INT16)
 MY_CHECK_TYPE_SIZE(uint16 UINT16)
 MY_CHECK_TYPE_SIZE(int32 INT32)
 MY_CHECK_TYPE_SIZE(uint32 UINT32)
-MY_CHECK_TYPE_SIZE(u_int32_t U_INT32_T)
 MY_CHECK_TYPE_SIZE(int64 INT64)
 MY_CHECK_TYPE_SIZE(uint64 UINT64)
 MY_CHECK_TYPE_SIZE(time_t TIME_T)
 SET (CMAKE_EXTRA_INCLUDE_FILES sys/types.h)
-MY_CHECK_TYPE_SIZE(bool  BOOL)
 SET(CMAKE_EXTRA_INCLUDE_FILES)
 IF(HAVE_SYS_SOCKET_H)
   SET(CMAKE_EXTRA_INCLUDE_FILES sys/socket.h)
 ENDIF(HAVE_SYS_SOCKET_H)
-MY_CHECK_TYPE_SIZE(socklen_t SOCKLEN_T)
 SET(CMAKE_EXTRA_INCLUDE_FILES)
 
 IF(HAVE_IEEEFP_H)
@@ -625,23 +571,6 @@ int main()
 }"
 TIME_T_UNSIGNED)
 
-
-CHECK_C_SOURCE_COMPILES("
-#ifdef _WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#endif
-int main()
-{
-  getaddrinfo( 0, 0, 0, 0);
-  return 0;
-}"
-HAVE_GETADDRINFO)
-
 CHECK_C_SOURCE_COMPILES("
 #ifdef _WIN32
 #include <winsock2.h>
@@ -861,21 +790,6 @@ IF(NOT HAVE_POSIX_SIGNALS)
     sigsetmask(mask); sigblock(mask); sigpause(mask);
   }"
   HAVE_BSD_SIGNALS)
-  IF (NOT HAVE_BSD_SIGNALS)
-    CHECK_C_SOURCE_COMPILES("
-    #include <signal.h>
-    void foo() { }
-    int main(int ac, char **av)
-    {
-      int mask = sigmask(SIGINT);
-      sigset(SIGINT, foo); sigrelse(SIGINT);
-      sighold(SIGINT); sigpause(SIGINT);
-    }"
-   HAVE_SVR3_SIGNALS)  
-   IF (NOT HAVE_SVR3_SIGNALS)
-    SET(HAVE_V7_SIGNALS 1)
-   ENDIF(NOT HAVE_SVR3_SIGNALS)
- ENDIF(NOT HAVE_BSD_SIGNALS)
 ENDIF(NOT HAVE_POSIX_SIGNALS)
 
 # Assume regular sprintf
@@ -920,16 +834,6 @@ CHECK_C_SOURCE_COMPILES("
 )
 
 CHECK_CXX_SOURCE_COMPILES("
-    #include <new>
-    int main()
-    {
-      char *c = new char;
-      return 0;
-    }"
-    HAVE_CXX_NEW
-)
-
-CHECK_CXX_SOURCE_COMPILES("
     #undef inline
     #if !defined(SCO) && !defined(__osf__) && !defined(_REENTRANT)
     #define _REENTRANT
@@ -1009,7 +913,7 @@ IF(WITH_VALGRIND)
 ENDIF()
 
 CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" 
-  HAVE_VALGRIND)
+  HAVE_VALGRIND_MEMCHECK_H)
 
 #--------------------------------------------------------------------
 # Check for IPv6 support
@@ -1062,11 +966,6 @@ CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6" sin6_len
 
 SET(CMAKE_EXTRA_INCLUDE_FILES) 
 
-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_UCONTEXT_H)
-
 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)
 
diff --git a/include/my_context.h b/include/my_context.h
index 1bf13fd1903..5de9f2882c5 100644
--- a/include/my_context.h
+++ b/include/my_context.h
@@ -62,7 +62,7 @@ struct my_context {
   ucontext_t base_context;
   ucontext_t spawned_context;
   int active;
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
   unsigned int valgrind_stack_id;
 #endif
 #ifndef DBUG_OFF
@@ -79,7 +79,7 @@ struct my_context {
   uint64_t save[9];
   void *stack_top;
   void *stack_bot;
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
   unsigned int valgrind_stack_id;
 #endif
 #ifndef DBUG_OFF
@@ -96,7 +96,7 @@ struct my_context {
   uint64_t save[7];
   void *stack_top;
   void *stack_bot;
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
   unsigned int valgrind_stack_id;
 #endif
 #ifndef DBUG_OFF
diff --git a/include/my_global.h b/include/my_global.h
index 30e08d7a03a..a15f483f509 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -153,13 +153,11 @@
 */
 #if defined(__APPLE__) && defined(__MACH__)
 #  undef SIZEOF_CHARP 
-#  undef SIZEOF_SHORT 
 #  undef SIZEOF_INT 
 #  undef SIZEOF_LONG 
 #  undef SIZEOF_LONG_LONG 
 #  undef SIZEOF_OFF_T 
 #  undef WORDS_BIGENDIAN
-#  define SIZEOF_SHORT 2
 #  define SIZEOF_INT 4
 #  define SIZEOF_LONG_LONG 8
 #  define SIZEOF_OFF_T 8
diff --git a/include/my_valgrind.h b/include/my_valgrind.h
index 4531ec78f9a..0662f5dce71 100644
--- a/include/my_valgrind.h
+++ b/include/my_valgrind.h
@@ -19,18 +19,18 @@
 #define IF_VALGRIND(A,B) B
 #endif
 
-#if defined(HAVE_VALGRIND) && defined(HAVE_valgrind)
+#if defined(HAVE_VALGRIND_MEMCHECK_H) && defined(HAVE_valgrind)
 # include <valgrind/memcheck.h>
 # define MEM_UNDEFINED(a,len) VALGRIND_MAKE_MEM_UNDEFINED(a,len)
 # define MEM_NOACCESS(a,len) VALGRIND_MAKE_MEM_NOACCESS(a,len)
 # define MEM_CHECK_ADDRESSABLE(a,len) VALGRIND_CHECK_MEM_IS_ADDRESSABLE(a,len)
 # define MEM_CHECK_DEFINED(a,len) VALGRIND_CHECK_MEM_IS_DEFINED(a,len)
-#else /* HAVE_VALGRIND */
+#else /* HAVE_VALGRIND_MEMCHECK_H */
 # define MEM_UNDEFINED(a,len) ((void) 0)
 # define MEM_NOACCESS(a,len) ((void) 0)
 # define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0)
 # define MEM_CHECK_DEFINED(a,len) ((void) 0)
-#endif /* HAVE_VALGRIND */
+#endif /* HAVE_VALGRIND_MEMCHECK_H */
 
 #ifndef DBUG_OFF
 #define TRASH_FILL(A,B,C) do { const size_t trash_tmp= (B); memset(A, C, trash_tmp); MEM_UNDEFINED(A, trash_tmp); } while (0)
diff --git a/include/mysql/psi/mysql_socket.h b/include/mysql/psi/mysql_socket.h
index 33768b20fa8..baab19785b9 100644
--- a/include/mysql/psi/mysql_socket.h
+++ b/include/mysql/psi/mysql_socket.h
@@ -1013,7 +1013,7 @@ inline_mysql_socket_accept
 #endif
   MYSQL_SOCKET socket_listen, struct sockaddr *addr, socklen_t *addr_len)
 {
-  int flags;
+  int flags __attribute__ ((unused));
 
   MYSQL_SOCKET socket_accept= MYSQL_INVALID_SOCKET;
   socklen_t addr_length= (addr_len != NULL) ? *addr_len : 0;
diff --git a/mysys/my_context.c b/mysys/my_context.c
index 60c0014b3b9..5faa041361a 100644
--- a/mysys/my_context.c
+++ b/mysys/my_context.c
@@ -24,7 +24,7 @@
 #include "m_string.h"
 #include "my_context.h"
 
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
 #include <valgrind/valgrind.h>
 #endif
 
@@ -134,7 +134,7 @@ my_context_init(struct my_context *c, size_t stack_size)
   if (!(c->stack= malloc(stack_size)))
     return -1;                                  /* Out of memory */
   c->stack_size= stack_size;
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
   c->valgrind_stack_id=
     VALGRIND_STACK_REGISTER(c->stack, ((unsigned char *)(c->stack))+stack_size);
 #endif
@@ -146,7 +146,7 @@ my_context_destroy(struct my_context *c)
 {
   if (c->stack)
   {
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
     VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id);
 #endif
     free(c->stack);
@@ -384,7 +384,7 @@ my_context_init(struct my_context *c, size_t stack_size)
     (( ((intptr)c->stack_bot + stack_size) & ~(intptr)0xf) - 16);
   bzero(c->stack_top, 16);
 
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
   c->valgrind_stack_id=
     VALGRIND_STACK_REGISTER(c->stack_bot, c->stack_top);
 #endif
@@ -397,7 +397,7 @@ my_context_destroy(struct my_context *c)
   if (c->stack_bot)
   {
     free(c->stack_bot);
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
     VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id);
 #endif
   }
@@ -620,7 +620,7 @@ my_context_init(struct my_context *c, size_t stack_size)
     (( ((intptr)c->stack_bot + stack_size) & ~(intptr)0xf) - 16);
   bzero(c->stack_top, 16);
 
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
   c->valgrind_stack_id=
     VALGRIND_STACK_REGISTER(c->stack_bot, c->stack_top);
 #endif
@@ -633,7 +633,7 @@ my_context_destroy(struct my_context *c)
   if (c->stack_bot)
   {
     free(c->stack_bot);
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
     VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id);
 #endif
   }
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index ec7e9207f38..9b0017c9124 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -317,8 +317,7 @@ IF(WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED)
   ENDIF()
 ENDIF()
 
-FOREACH(tool glibtoolize libtoolize aclocal autoconf autoheader automake gtar 
- tar git)
+FOREACH(tool gtar tar git)
  STRING(TOUPPER ${tool}  TOOL)
  FIND_PROGRAM(${TOOL}_EXECUTABLE ${tool} DOC "path to the executable")
  MARK_AS_ADVANCED(${TOOL}_EXECUTABLE)
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index 2726f6233ea..519fdceec51 100644
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -83,6 +83,9 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DUNIV_DEBUG -DUNIV_SYNC_DEB
 #ENDIF()
 
 CHECK_FUNCTION_EXISTS(sched_getcpu  HAVE_SCHED_GETCPU)
+IF(HAVE_SCHED_GETCPU)
+  ADD_DEFINITIONS(-DHAVE_SCHED_GETCPU)
+ENDIF()
 
 IF(NOT MSVC)
   # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
@@ -240,11 +243,13 @@ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC)
   ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1)
 ENDIF()
 
-CHECK_C_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS)
+CHECK_CXX_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS)
+IF(HAVE_C99_INITIALIZERS)
+  ADD_DEFINITIONS(-DHAVE_C99_INITIALIZERS)
+ENDIF()
 
 ENDIF(NOT MSVC)
 
-CHECK_FUNCTION_EXISTS(asprintf  HAVE_ASPRINTF)
 CHECK_FUNCTION_EXISTS(vasprintf  HAVE_VASPRINTF)
 
 # Solaris atomics
diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt
index 9cc30d896ee..66e1c5f9aff 100644
--- a/storage/tokudb/CMakeLists.txt
+++ b/storage/tokudb/CMakeLists.txt
@@ -30,15 +30,12 @@ MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-vla" DEBUG)
 ############################################
 SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-10.2/README-TOKUDB\nusr/share/doc/mariadb-server-10.2/README.md" PARENT_SCOPE)
 SET(TOKUDB_VERSION "tokudb-7.5.7")
-SET(USE_BDB OFF CACHE BOOL "")
-MARK_AS_ADVANCED(BUILDNAME)
 MARK_AS_ADVANCED(BUILD_TESTING)
 MARK_AS_ADVANCED(CMAKE_TOKUDB_REVISION)
 MARK_AS_ADVANCED(LIBTOKUDB)
 MARK_AS_ADVANCED(LIBTOKUPORTABILITY)
 MARK_AS_ADVANCED(TOKUDB_DATA)
 MARK_AS_ADVANCED(TOKU_DEBUG_PARANOID)
-MARK_AS_ADVANCED(USE_BDB)
 MARK_AS_ADVANCED(USE_VALGRIND)
 MARK_AS_ADVANCED(XZ_SOURCE_DIR)
 ############################################
diff --git a/storage/tokudb/ft-index/CMakeLists.txt b/storage/tokudb/ft-index/CMakeLists.txt
index c6846dae679..9cda74ce07d 100644
--- a/storage/tokudb/ft-index/CMakeLists.txt
+++ b/storage/tokudb/ft-index/CMakeLists.txt
@@ -33,7 +33,7 @@ endif()
 
 include(TokuFeatureDetection)
 include(TokuSetupCompiler)
-include(TokuSetupCTest)
+#include(TokuSetupCTest)
 include(TokuThirdParty)
 
 set(TOKU_CMAKE_SCRIPT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
diff --git a/storage/tokudb/ft-index/portability/toku_config.h.in b/storage/tokudb/ft-index/portability/toku_config.h.in
index c56674ece9e..88448ec4e00 100644
--- a/storage/tokudb/ft-index/portability/toku_config.h.in
+++ b/storage/tokudb/ft-index/portability/toku_config.h.in
@@ -47,6 +47,10 @@
 #cmakedefine HAVE_O_DIRECT 1
 #cmakedefine HAVE_F_NOCACHE 1
 
+#cmakedefine HAVE_MAP_ANONYMOUS 1
+#cmakedefine HAVE_MINCORE 1
+#cmakedefine HAVE_PR_SET_PTRACER 1
+#cmakedefine HAVE_PR_SET_PTRACER_ANY 1
 #cmakedefine HAVE_MALLOC_SIZE 1
 #cmakedefine HAVE_MALLOC_USABLE_SIZE 1
 #cmakedefine HAVE_MEMALIGN 1
diff --git a/storage/xtradb/CMakeLists.txt b/storage/xtradb/CMakeLists.txt
index 36751fe7273..7439dcb249c 100644
--- a/storage/xtradb/CMakeLists.txt
+++ b/storage/xtradb/CMakeLists.txt
@@ -88,6 +88,9 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DUNIV_DEBUG -DUNIV_SYNC_DEB
 #ENDIF()
 
 CHECK_FUNCTION_EXISTS(sched_getcpu  HAVE_SCHED_GETCPU)
+IF(HAVE_SCHED_GETCPU)
+  ADD_DEFINITIONS(-DHAVE_SCHED_GETCPU)
+ENDIF()
 
 IF(NOT MSVC)
   # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
@@ -230,11 +233,13 @@ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC)
   ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1)
 ENDIF()
 
-CHECK_C_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS)
+CHECK_CXX_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS)
+IF(HAVE_C99_INITIALIZERS)
+  ADD_DEFINITIONS(-DHAVE_C99_INITIALIZERS)
+ENDIF()
 
 ENDIF(NOT MSVC)
 
-CHECK_FUNCTION_EXISTS(asprintf  HAVE_ASPRINTF)
 CHECK_FUNCTION_EXISTS(vasprintf  HAVE_VASPRINTF)
 
 # Solaris atomics