Add windows system check cache that prevents tests from running, most are irrelevant anyway

Add cached variable WITH_XXX_STORAGE_ENGINE for dynamic plugins that can be static or 
dynamic.

6 files changed, 536 insertions, 180 deletions

diff --git a/cmake/Makefile.am b/cmake/Makefile.am
index f6172a62e1d..86244a526c1 100644
--- a/cmake/Makefile.am
+++ b/cmake/Makefile.am
@@ -26,6 +26,7 @@ EXTRA_DIST = \
 	install_layout.cmake \
 	build_configurations/mysql_release.cmake \
 	os/Windows.cmake \ 
+	os/WindowsCache.cmake \
 	os/Linux.cmake \
 	os/SunOS.cmake \
 	os/Darwin.cmake \
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake
index ce82575ef76..f1f483dfb33 100644
--- a/cmake/os/Windows.cmake
+++ b/cmake/os/Windows.cmake
@@ -27,7 +27,14 @@ INCLUDE (CheckTypeSize)
 
 # Optionally read user configuration, generated by configure.js.
 # This is left for backward compatibility reasons only.
-INCLUDE(win/configure.data OPTIONAL)
+INCLUDE(${CMAKE_BINARY_DIR}/win/configure.data OPTIONAL)
+
+# avoid running system checks by using pre-cached check results
+# system checks are expensive on VS since every tiny program is to be compiled in 
+# a VC solution.
+GET_FILENAME_COMPONENT(_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
+INCLUDE(${_SCRIPT_DIR}/WindowsCache.cmake)
+ 
 
 # OS display name (version_compile_os etc).
 # Used by the test suite to ignore bugs on some platforms, 
@@ -97,8 +104,8 @@ IF(MSVC)
   ENDIF()
   
   #TODO: update the code and remove the disabled warnings
+  ADD_DEFINITIONS(/wd4800 /wd4805)
   IF (MSVC_VERSION GREATER 1310)
-    ADD_DEFINITIONS(/wd4800 /wd4805)
     ADD_DEFINITIONS(/wd4996)
   ENDIF()
 
@@ -179,6 +186,7 @@ CHECK_FUNCTION_REPLACEMENT(snprintf _snprintf)
 CHECK_FUNCTION_REPLACEMENT(strtok_r strtok_s)
 CHECK_FUNCTION_REPLACEMENT(strtoll _strtoi64)
 CHECK_FUNCTION_REPLACEMENT(strtoull _strtoui64)
+CHECK_FUNCTION_REPLACEMENT(vsnprintf _vsnprintf)
 CHECK_TYPE_SIZE(ssize_t SIZE_OF_SSIZE_T)
 IF(NOT HAVE_SIZE_OF_SSIZE_T)
  SET(ssize_t SSIZE_T)
diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake
new file mode 100644
index 00000000000..8cf84e9d2e7
--- /dev/null
+++ b/cmake/os/WindowsCache.cmake
@@ -0,0 +1,342 @@
+# Copyright (C) 2010 Sun Microsystems, Inc
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
+
+# Avoid system checks on Windows by pre-caching  results. Most of the system checks 
+# are not relevant for Windows anyway and it takes lot more time to run them,
+# since CMake  to creates a Visual Studio project for each tiny test.
+# Note that only we  cache values on VC++ only, MinGW would give slightly 
+# different results.
+
+IF(MSVC)
+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 "")
+SET(HAVE_ASM_MSR_H CACHE  INTERNAL "")
+SET(HAVE_BACKTRACE CACHE  INTERNAL "")
+SET(HAVE_BACKTRACE_SYMBOLS CACHE  INTERNAL "")
+SET(HAVE_BACKTRACE_SYMBOLS_FD CACHE  INTERNAL "")
+SET(HAVE_BCMP 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_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_GETCWD 1 CACHE  INTERNAL "")
+SET(HAVE_GETHOSTBYADDR_R CACHE  INTERNAL "")
+SET(HAVE_GETHOSTBYNAME_R CACHE  INTERNAL "")
+SET(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE CACHE  INTERNAL "")
+SET(HAVE_GETHOSTBYNAME_R_RETURN_INT 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 "")
+SET(HAVE_GETPWNAM CACHE  INTERNAL "")
+SET(HAVE_GETPWUID CACHE  INTERNAL "")
+SET(HAVE_GETRLIMIT CACHE  INTERNAL "")
+SET(HAVE_GETRUSAGE CACHE  INTERNAL "")
+SET(HAVE_GETTIMEOFDAY CACHE  INTERNAL "")
+SET(HAVE_GETWD CACHE  INTERNAL "")
+SET(HAVE_GMTIME_R CACHE  INTERNAL "")
+SET(HAVE_GRP_H CACHE  INTERNAL "")
+SET(HAVE_IA64INTRIN_H CACHE  INTERNAL "")
+SET(HAVE_IEEEFP_H CACHE  INTERNAL "")
+SET(HAVE_INDEX CACHE  INTERNAL "")
+SET(HAVE_INITGROUPS CACHE  INTERNAL "")
+SET(HAVE_INTTYPES_H CACHE  INTERNAL "")
+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_ISNAN CACHE  INTERNAL "")
+SET(HAVE_ISSETUGID 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 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 "")
+SET(HAVE_MALLINFO CACHE  INTERNAL "")
+SET(HAVE_MALLOC_H 1 CACHE  INTERNAL "")
+SET(HAVE_MEMALIGN CACHE  INTERNAL "")
+SET(HAVE_MEMCPY 1 CACHE  INTERNAL "")
+SET(HAVE_MEMMOVE 1 CACHE  INTERNAL "")
+SET(HAVE_MEMORY_H 1 CACHE  INTERNAL "")
+SET(HAVE_MKSTEMP CACHE  INTERNAL "")
+SET(HAVE_MLOCK CACHE  INTERNAL "")
+SET(HAVE_MLOCKALL CACHE  INTERNAL "")
+SET(HAVE_MMAP CACHE  INTERNAL "")
+SET(HAVE_MMAP64 CACHE  INTERNAL "")
+SET(HAVE_NETINET_IN6_H CACHE  INTERNAL "")
+SET(HAVE_NETINET_IN_H CACHE  INTERNAL "")
+SET(HAVE_NL_LANGINFO CACHE  INTERNAL "")
+SET(HAVE_PASE_ENVIRONMENT CACHE  INTERNAL "")
+SET(HAVE_PATHS_H CACHE  INTERNAL "")
+SET(HAVE_PCLOSE CACHE  INTERNAL "")
+SET(HAVE_PERROR 1 CACHE  INTERNAL "")
+SET(HAVE_POLL CACHE  INTERNAL "")
+SET(HAVE_POPEN 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 "")
+SET(HAVE_PRINTSTACK CACHE  INTERNAL "")
+SET(HAVE_PTHREAD_ATTR_CREATE CACHE  INTERNAL "")
+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 "")
+SET(HAVE_PWD_H CACHE  INTERNAL "")
+SET(HAVE_RDTSCLL CACHE  INTERNAL "")
+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 "")
+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 "")
+SET(HAVE_SIZEOF_INT TRUE CACHE  INTERNAL "")
+SET(SIZEOF_INT 4 CACHE  INTERNAL "")
+SET(HAVE_SIZEOF_INT16 FALSE CACHE  INTERNAL "")
+SET(HAVE_SIZEOF_INT32 FALSE CACHE  INTERNAL "")
+SET(HAVE_SIZEOF_INT64 FALSE CACHE  INTERNAL "")
+SET(HAVE_SIZEOF_INT8 FALSE CACHE  INTERNAL "")
+SET(HAVE_SIZEOF_LONG TRUE CACHE  INTERNAL "")
+SET(SIZEOF_LONG 4 CACHE  INTERNAL "")
+SET(HAVE_SIZEOF_LONG_LONG TRUE CACHE  INTERNAL "")
+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 "")
+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_SNPRINTF CACHE  INTERNAL "")
+SET(HAVE_SOCKADDR_STORAGE_SS_FAMILY 1 CACHE  INTERNAL "")
+SET(HAVE_SOLARIS_STYLE_GETHOST CACHE  INTERNAL "")
+SET(STACK_DIRECTION -1 CACHE INTERNAL "")
+SET(HAVE_STDARG_H 1 CACHE  INTERNAL "")
+SET(HAVE_STDDEF_H 1 CACHE  INTERNAL "")
+SET(HAVE_STDINT_H CACHE  INTERNAL "")
+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 "")
+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_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_ERRLIST CACHE  INTERNAL "")
+SET(HAVE_SYS_FILE_H CACHE  INTERNAL "")
+SET(HAVE_SYS_FPU_H CACHE  INTERNAL "")
+SET(HAVE_SYS_IOCTL CACHE  INTERNAL "")
+SET(HAVE_SYS_IOCTL_H CACHE  INTERNAL "")
+SET(HAVE_SYS_IPC_H CACHE  INTERNAL "")
+SET(HAVE_SYS_MALLOC_H CACHE  INTERNAL "")
+SET(HAVE_SYS_MMAN_H CACHE  INTERNAL "")
+SET(HAVE_SYS_PARAM_H CACHE  INTERNAL "")
+SET(HAVE_SYS_PRCTL_H CACHE  INTERNAL "")
+SET(HAVE_SYS_PTEM_H CACHE  INTERNAL "")
+SET(HAVE_SYS_PTE_H CACHE  INTERNAL "")
+SET(HAVE_SYS_RESOURCE_H CACHE  INTERNAL "")
+SET(HAVE_SYS_SELECT_H CACHE  INTERNAL "")
+SET(HAVE_SYS_SHM_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 "")
+SET(HAVE_SYS_TYPES_H 1 CACHE  INTERNAL "")
+SET(HAVE_SYS_UN_H CACHE  INTERNAL "")
+SET(HAVE_SYS_UTIME_H 1 CACHE  INTERNAL "")
+SET(HAVE_SYS_VADVISE_H CACHE  INTERNAL "")
+SET(HAVE_SYS_WAIT_H CACHE  INTERNAL "")
+SET(HAVE_TCGETATTR CACHE  INTERNAL "")
+SET(HAVE_TELL 1 CACHE  INTERNAL "")
+SET(HAVE_TEMPNAM 1 CACHE  INTERNAL "")
+SET(HAVE_TERMCAP_H CACHE  INTERNAL "")
+SET(HAVE_TERMIOS_H CACHE  INTERNAL "")
+SET(HAVE_TERMIO_H CACHE  INTERNAL "")
+SET(HAVE_TERM_H CACHE  INTERNAL "")
+SET(HAVE_THR_SETCONCURRENCY CACHE  INTERNAL "")
+SET(HAVE_THR_YIELD CACHE  INTERNAL "")
+SET(HAVE_TIME 1 CACHE  INTERNAL "")
+SET(HAVE_TIMES CACHE  INTERNAL "")
+SET(HAVE_TIMESPEC_TS_SEC CACHE  INTERNAL "")
+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()
+SET(HAVE_WEAK_SYMBOL CACHE  INTERNAL "")
+SET(HAVE_WORDS_BIGENDIAN TRUE CACHE  INTERNAL "")
+SET(WORDS_BIGENDIAN CACHE  INTERNAL "")
+SET(HAVE__S_IFIFO 1 CACHE  INTERNAL "")
+SET(HAVE__S_IREAD 1 CACHE  INTERNAL "")
+SET(HAVE__finite 1 CACHE  INTERNAL "")
+SET(HAVE__isnan 1 CACHE  INTERNAL "")
+SET(HAVE__pclose 1 CACHE  INTERNAL "")
+SET(HAVE__popen 1 CACHE  INTERNAL "")
+SET(HAVE__snprintf 1 CACHE  INTERNAL "")
+SET(HAVE__stricmp 1 CACHE  INTERNAL "")
+SET(HAVE__strnicmp 1 CACHE  INTERNAL "")
+SET(HAVE__strtoi64 1 CACHE  INTERNAL "")
+SET(HAVE__strtoui64 1 CACHE  INTERNAL "")
+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(TIOCSTAT_IN_SYS_IOCTL CACHE INTERNAL "")
+SET(HAVE_S_IROTH CACHE INTERNAL "")
+SET(HAVE_S_IFIFO CACHE INTERNAL "")
+SET(QSORT_TYPE_IS_VOID 1 CACHE INTERNAL "")
+SET(SIGNAL_RETURN_TYPE_IS_VOID 1 CACHE INTERNAL "")
+SET(C_HAS_inline CACHE INTERNAL "")
+SET(C_HAS___inline 1 CACHE INTERNAL "")
+SET(FIONREAD_IN_SYS_IOCTL CACHE INTERNAL "")
+SET(GWINSZ_IN_SYS_IOCTL CACHE INTERNAL "")
+ENDIF()
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index 2c00c71c3ee..d6411641192 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -160,7 +160,11 @@ MACRO(MYSQL_ADD_PLUGIN)
     ENDIF()
     ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES})
 
-
+	IF(NOT ARG_MODULE_ONLY)
+      # set cached variable, e.g with checkbox in GUI
+      SET(${with_var} OFF CACHE BOOL "Link ${plugin} statically to the server" 
+       FORCE)
+	ENDIF()
     SET_TARGET_PROPERTIES(${target} PROPERTIES 
       OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}")  
     # Install dynamic library
diff --git a/config.h.cmake b/config.h.cmake
index 3b4a463714f..8e7cc99f1c2 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -540,6 +540,7 @@
 #cmakedefine strtok_r @strtok_r@
 #cmakedefine strtoll @strtoll@
 #cmakedefine strtoull @strtoull@
+#cmakedefine vsnprintf @vsnprintf@
 #if (_MSC_VER > 1310)
 #define HAVE_SETENV
 #define setenv(a,b,c) _putenv_s(a,b)
diff --git a/configure.cmake b/configure.cmake
index 8a2a1f0ad78..9a1fdfa7942 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -154,7 +154,7 @@ ENDIF()
 # on Windows. In such cases it makes sense to use these macros
 # as build  with Visual Studio is considerably faster if irrelevant
 # checks are omitted.
-MACRO(CHECK_INCLUDE_FILES_UNIX INCLUDES VAR)
+MACRO(CHECK_INCLUDE_FILES INCLUDES VAR)
 IF(UNIX)
   CHECK_INCLUDE_FILES ("${INCLUDES}" ${VAR})
 ENDIF()
@@ -166,19 +166,19 @@ IF(UNIX)
 ENDIF()
 ENDMACRO()
 
-MACRO(CHECK_CXX_SOURCE_COMPILES_UNIX SRC VAR)
+MACRO(CHECK_CXX_SOURCE_COMPILES SRC VAR)
 IF(UNIX)
   CHECK_CXX_SOURCE_COMPILES("${SRC}" ${VAR})
 ENDIF()
 ENDMACRO()
 
-MACRO(CHECK_FUNCTION_EXISTS_UNIX FUNC VAR)
+MACRO(CHECK_FUNCTION_EXISTS FUNC VAR)
 IF(UNIX)
   CHECK_FUNCTION_EXISTS("${FUNC}" ${VAR})
 ENDIF()
 ENDMACRO()
 
-MACRO (CHECK_SYMBOL_EXISTS_UNIX SYM HEADER VAR)
+MACRO (CHECK_SYMBOL_EXISTS SYM HEADER VAR)
 IF(UNIX)
   CHECK_SYMBOL_EXISTS("${SYM}" "${HEADER}" ${VAR})
 ENDIF()
@@ -191,74 +191,74 @@ INCLUDE (CheckIncludeFiles)
 
 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_UNIX (alloca.h HAVE_ALLOCA_H)
-CHECK_INCLUDE_FILES_UNIX (aio.h HAVE_AIO_H)
-CHECK_INCLUDE_FILES_UNIX (arpa/inet.h HAVE_ARPA_INET_H)
-CHECK_INCLUDE_FILES_UNIX (crypt.h HAVE_CRYPT_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)
-CHECK_INCLUDE_FILES_UNIX (dlfcn.h HAVE_DLFCN_H)
-CHECK_INCLUDE_FILES_UNIX (execinfo.h HAVE_EXECINFO_H)
+CHECK_INCLUDE_FILES (dlfcn.h HAVE_DLFCN_H)
+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_UNIX (floatingpoint.h HAVE_FLOATINGPOINT_H)
-CHECK_INCLUDE_FILES_UNIX (fpu_control.h HAVE_FPU_CONTROL_H)
-CHECK_INCLUDE_FILES_UNIX (grp.h HAVE_GRP_H)
-CHECK_INCLUDE_FILES_UNIX (ieeefp.h HAVE_IEEEFP_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)
 CHECK_INCLUDE_FILES (inttypes.h HAVE_INTTYPES_H)
-CHECK_INCLUDE_FILES_UNIX (langinfo.h HAVE_LANGINFO_H)
+CHECK_INCLUDE_FILES (langinfo.h HAVE_LANGINFO_H)
 CHECK_INCLUDE_FILES (limits.h HAVE_LIMITS_H)
 CHECK_INCLUDE_FILES (locale.h HAVE_LOCALE_H)
 CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)
 CHECK_INCLUDE_FILES (memory.h HAVE_MEMORY_H)
-CHECK_INCLUDE_FILES_UNIX (netinet/in.h HAVE_NETINET_IN_H)
-CHECK_INCLUDE_FILES_UNIX (paths.h HAVE_PATHS_H)
-CHECK_INCLUDE_FILES_UNIX (port.h HAVE_PORT_H)
-CHECK_INCLUDE_FILES_UNIX (pwd.h HAVE_PWD_H)
-CHECK_INCLUDE_FILES_UNIX (sched.h HAVE_SCHED_H)
-CHECK_INCLUDE_FILES_UNIX (select.h HAVE_SELECT_H)
-CHECK_INCLUDE_FILES_UNIX (semaphore.h HAVE_SEMAPHORE_H)
-CHECK_INCLUDE_FILES_UNIX (sys/dir.h HAVE_SYS_DIR_H)
-CHECK_INCLUDE_FILES_UNIX (sys/pte.h HAVE_SYS_PTE_H)
-CHECK_INCLUDE_FILES_UNIX (sys/ptem.h HAVE_SYS_PTEM_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 (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/dir.h HAVE_SYS_DIR_H)
+CHECK_INCLUDE_FILES (sys/pte.h HAVE_SYS_PTE_H)
+CHECK_INCLUDE_FILES (sys/ptem.h HAVE_SYS_PTEM_H)
 CHECK_INCLUDE_FILES (stddef.h HAVE_STDDEF_H)
 CHECK_INCLUDE_FILES (stdint.h HAVE_STDINT_H)
 CHECK_INCLUDE_FILES (stdlib.h HAVE_STDLIB_H)
 CHECK_INCLUDE_FILES (strings.h HAVE_STRINGS_H)
 CHECK_INCLUDE_FILES (string.h HAVE_STRING_H)
-CHECK_INCLUDE_FILES_UNIX (synch.h HAVE_SYNCH_H)
-CHECK_INCLUDE_FILES_UNIX (sysent.h HAVE_SYSENT_H)
-CHECK_INCLUDE_FILES_UNIX (sys/cdefs.h HAVE_SYS_CDEFS_H)
-CHECK_INCLUDE_FILES_UNIX (sys/file.h HAVE_SYS_FILE_H)
-CHECK_INCLUDE_FILES_UNIX (sys/fpu.h HAVE_SYS_FPU_H)
-CHECK_INCLUDE_FILES_UNIX (sys/ioctl.h HAVE_SYS_IOCTL_H)
-CHECK_INCLUDE_FILES_UNIX (sys/ipc.h HAVE_SYS_IPC_H)
-CHECK_INCLUDE_FILES_UNIX (sys/malloc.h HAVE_SYS_MALLOC_H)
-CHECK_INCLUDE_FILES_UNIX (sys/mman.h HAVE_SYS_MMAN_H)
-CHECK_INCLUDE_FILES_UNIX (sys/prctl.h HAVE_SYS_PRCTL_H)
-CHECK_INCLUDE_FILES_UNIX (sys/resource.h HAVE_SYS_RESOURCE_H)
-CHECK_INCLUDE_FILES_UNIX (sys/select.h HAVE_SYS_SELECT_H)
-CHECK_INCLUDE_FILES_UNIX (sys/shm.h HAVE_SYS_SHM_H)
-CHECK_INCLUDE_FILES_UNIX (sys/socket.h HAVE_SYS_SOCKET_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)
+CHECK_INCLUDE_FILES (sys/ipc.h HAVE_SYS_IPC_H)
+CHECK_INCLUDE_FILES (sys/malloc.h HAVE_SYS_MALLOC_H)
+CHECK_INCLUDE_FILES (sys/mman.h HAVE_SYS_MMAN_H)
+CHECK_INCLUDE_FILES (sys/prctl.h HAVE_SYS_PRCTL_H)
+CHECK_INCLUDE_FILES (sys/resource.h HAVE_SYS_RESOURCE_H)
+CHECK_INCLUDE_FILES (sys/select.h HAVE_SYS_SELECT_H)
+CHECK_INCLUDE_FILES (sys/shm.h HAVE_SYS_SHM_H)
+CHECK_INCLUDE_FILES (sys/socket.h HAVE_SYS_SOCKET_H)
 CHECK_INCLUDE_FILES (sys/stat.h HAVE_SYS_STAT_H)
-CHECK_INCLUDE_FILES_UNIX (sys/stream.h HAVE_SYS_STREAM_H)
-CHECK_INCLUDE_FILES_UNIX (sys/termcap.h HAVE_SYS_TERMCAP_H)
+CHECK_INCLUDE_FILES (sys/stream.h HAVE_SYS_STREAM_H)
+CHECK_INCLUDE_FILES (sys/termcap.h HAVE_SYS_TERMCAP_H)
 CHECK_INCLUDE_FILES ("time.h;sys/timeb.h" HAVE_SYS_TIMEB_H)
-CHECK_INCLUDE_FILES_UNIX ("curses.h;term.h" HAVE_TERM_H)
-CHECK_INCLUDE_FILES_UNIX (termios.h HAVE_TERMIOS_H)
-CHECK_INCLUDE_FILES_UNIX (termio.h HAVE_TERMIO_H)
-CHECK_INCLUDE_FILES_UNIX (termcap.h HAVE_TERMCAP_H)
-CHECK_INCLUDE_FILES_UNIX (unistd.h HAVE_UNISTD_H)
+CHECK_INCLUDE_FILES ("curses.h;term.h" HAVE_TERM_H)
+CHECK_INCLUDE_FILES (termios.h HAVE_TERMIOS_H)
+CHECK_INCLUDE_FILES (termio.h HAVE_TERMIO_H)
+CHECK_INCLUDE_FILES (termcap.h HAVE_TERMCAP_H)
+CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H)
 CHECK_INCLUDE_FILES (utime.h HAVE_UTIME_H)
 CHECK_INCLUDE_FILES (varargs.h HAVE_VARARGS_H)
 CHECK_INCLUDE_FILES (sys/time.h HAVE_SYS_TIME_H)
 CHECK_INCLUDE_FILES (sys/utime.h HAVE_SYS_UTIME_H)
-CHECK_INCLUDE_FILES_UNIX (sys/wait.h HAVE_SYS_WAIT_H)
-CHECK_INCLUDE_FILES_UNIX (sys/param.h HAVE_SYS_PARAM_H)
-CHECK_INCLUDE_FILES_UNIX (sys/vadvise.h HAVE_SYS_VADVISE_H)
-CHECK_INCLUDE_FILES_UNIX (fnmatch.h HAVE_FNMATCH_H)
+CHECK_INCLUDE_FILES (sys/wait.h HAVE_SYS_WAIT_H)
+CHECK_INCLUDE_FILES (sys/param.h HAVE_SYS_PARAM_H)
+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_UNIX("stdlib.h;sys/un.h" HAVE_SYS_UN_H)
+CHECK_INCLUDE_FILES("stdlib.h;sys/un.h" HAVE_SYS_UN_H)
 
 # Figure out threading library
 #
@@ -268,116 +268,116 @@ FIND_PACKAGE (Threads)
 # Tests for functions
 #
 #CHECK_FUNCTION_EXISTS (aiowait HAVE_AIOWAIT)
-CHECK_FUNCTION_EXISTS_UNIX (aio_read HAVE_AIO_READ)
-CHECK_FUNCTION_EXISTS_UNIX (alarm HAVE_ALARM)
+CHECK_FUNCTION_EXISTS (aio_read HAVE_AIO_READ)
+CHECK_FUNCTION_EXISTS (alarm HAVE_ALARM)
 SET(HAVE_ALLOCA 1)
-CHECK_FUNCTION_EXISTS_UNIX (backtrace HAVE_BACKTRACE)
-CHECK_FUNCTION_EXISTS_UNIX (backtrace_symbols HAVE_BACKTRACE_SYMBOLS)
-CHECK_FUNCTION_EXISTS_UNIX (backtrace_symbols_fd HAVE_BACKTRACE_SYMBOLS_FD)
-CHECK_FUNCTION_EXISTS_UNIX (printstack HAVE_PRINTSTACK)
-CHECK_FUNCTION_EXISTS_UNIX (bcmp HAVE_BCMP)
-CHECK_FUNCTION_EXISTS_UNIX (bfill HAVE_BFILL)
-CHECK_FUNCTION_EXISTS_UNIX (bmove HAVE_BMOVE)
+CHECK_FUNCTION_EXISTS (backtrace HAVE_BACKTRACE)
+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 (bcmp HAVE_BCMP)
+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_UNIX (bzero HAVE_BZERO)
-CHECK_FUNCTION_EXISTS_UNIX (clock_gettime HAVE_CLOCK_GETTIME)
-CHECK_FUNCTION_EXISTS_UNIX (cuserid HAVE_CUSERID)
-CHECK_FUNCTION_EXISTS_UNIX (directio HAVE_DIRECTIO)
-CHECK_FUNCTION_EXISTS_UNIX (_doprnt HAVE_DOPRNT)
-CHECK_FUNCTION_EXISTS_UNIX (flockfile HAVE_FLOCKFILE)
-CHECK_FUNCTION_EXISTS_UNIX (ftruncate HAVE_FTRUNCATE)
-CHECK_FUNCTION_EXISTS_UNIX (getline HAVE_GETLINE)
-CHECK_FUNCTION_EXISTS_UNIX (compress HAVE_COMPRESS)
-CHECK_FUNCTION_EXISTS_UNIX (crypt HAVE_CRYPT)
-CHECK_FUNCTION_EXISTS_UNIX (dlerror HAVE_DLERROR)
-CHECK_FUNCTION_EXISTS_UNIX (dlopen HAVE_DLOPEN)
-CHECK_FUNCTION_EXISTS_UNIX (fchmod HAVE_FCHMOD)
-CHECK_FUNCTION_EXISTS_UNIX (fcntl HAVE_FCNTL)
-CHECK_FUNCTION_EXISTS_UNIX (fconvert HAVE_FCONVERT)
-CHECK_SYMBOL_EXISTS_UNIX(fdatasync "unistd.h" HAVE_FDATASYNC)
-CHECK_FUNCTION_EXISTS_UNIX (fesetround HAVE_FESETROUND)
-CHECK_FUNCTION_EXISTS_UNIX (fpsetmask HAVE_FPSETMASK)
-CHECK_FUNCTION_EXISTS_UNIX (fseeko HAVE_FSEEKO)
-CHECK_FUNCTION_EXISTS_UNIX (fsync HAVE_FSYNC)
+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_SYMBOL_EXISTS(fdatasync "unistd.h" HAVE_FDATASYNC)
+CHECK_FUNCTION_EXISTS (fesetround HAVE_FESETROUND)
+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_UNIX (gethostbyaddr_r HAVE_GETHOSTBYADDR_R)
-CHECK_FUNCTION_EXISTS_UNIX (gethostbyname_r HAVE_GETHOSTBYNAME_R)
-CHECK_FUNCTION_EXISTS_UNIX (gethrtime HAVE_GETHRTIME)
+CHECK_FUNCTION_EXISTS (gethostbyaddr_r HAVE_GETHOSTBYADDR_R)
+CHECK_FUNCTION_EXISTS (gethostbyname_r HAVE_GETHOSTBYNAME_R)
+CHECK_FUNCTION_EXISTS (gethrtime HAVE_GETHRTIME)
 CHECK_FUNCTION_EXISTS (getnameinfo HAVE_GETNAMEINFO)
-CHECK_FUNCTION_EXISTS_UNIX (getpass HAVE_GETPASS)
-CHECK_FUNCTION_EXISTS_UNIX (getpassphrase HAVE_GETPASSPHRASE)
-CHECK_FUNCTION_EXISTS_UNIX (getpwnam HAVE_GETPWNAM)
-CHECK_FUNCTION_EXISTS_UNIX (getpwuid HAVE_GETPWUID)
-CHECK_FUNCTION_EXISTS_UNIX (getrlimit HAVE_GETRLIMIT)
-CHECK_FUNCTION_EXISTS_UNIX (getrusage HAVE_GETRUSAGE)
-CHECK_FUNCTION_EXISTS_UNIX (getwd HAVE_GETWD)
-CHECK_FUNCTION_EXISTS_UNIX (gmtime_r HAVE_GMTIME_R)
-CHECK_FUNCTION_EXISTS_UNIX (initgroups HAVE_INITGROUPS)
-CHECK_FUNCTION_EXISTS_UNIX (issetugid HAVE_ISSETUGID)
+CHECK_FUNCTION_EXISTS (getpass HAVE_GETPASS)
+CHECK_FUNCTION_EXISTS (getpassphrase HAVE_GETPASSPHRASE)
+CHECK_FUNCTION_EXISTS (getpwnam HAVE_GETPWNAM)
+CHECK_FUNCTION_EXISTS (getpwuid HAVE_GETPWUID)
+CHECK_FUNCTION_EXISTS (getrlimit HAVE_GETRLIMIT)
+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 (ldiv HAVE_LDIV)
-CHECK_FUNCTION_EXISTS_UNIX (localtime_r HAVE_LOCALTIME_R)
+CHECK_FUNCTION_EXISTS (localtime_r HAVE_LOCALTIME_R)
 CHECK_FUNCTION_EXISTS (longjmp HAVE_LONGJMP)
 CHECK_FUNCTION_EXISTS (lstat HAVE_LSTAT)
-CHECK_FUNCTION_EXISTS_UNIX (madvise HAVE_MADVISE)
-CHECK_FUNCTION_EXISTS_UNIX (mallinfo HAVE_MALLINFO)
+CHECK_FUNCTION_EXISTS (madvise HAVE_MADVISE)
+CHECK_FUNCTION_EXISTS (mallinfo HAVE_MALLINFO)
 CHECK_FUNCTION_EXISTS (memcpy HAVE_MEMCPY)
 CHECK_FUNCTION_EXISTS (memmove HAVE_MEMMOVE)
 CHECK_FUNCTION_EXISTS (mkstemp HAVE_MKSTEMP)
-CHECK_FUNCTION_EXISTS_UNIX (mlock HAVE_MLOCK)
-CHECK_FUNCTION_EXISTS_UNIX (mlockall HAVE_MLOCKALL)
-CHECK_FUNCTION_EXISTS_UNIX (mmap HAVE_MMAP)
-CHECK_FUNCTION_EXISTS_UNIX (mmap64 HAVE_MMAP64)
+CHECK_FUNCTION_EXISTS (mlock HAVE_MLOCK)
+CHECK_FUNCTION_EXISTS (mlockall HAVE_MLOCKALL)
+CHECK_FUNCTION_EXISTS (mmap HAVE_MMAP)
+CHECK_FUNCTION_EXISTS (mmap64 HAVE_MMAP64)
 CHECK_FUNCTION_EXISTS (perror HAVE_PERROR)
-CHECK_FUNCTION_EXISTS_UNIX (poll HAVE_POLL)
-CHECK_FUNCTION_EXISTS_UNIX (port_create HAVE_PORT_CREATE)
-CHECK_FUNCTION_EXISTS_UNIX (posix_fallocate HAVE_POSIX_FALLOCATE)
-CHECK_FUNCTION_EXISTS_UNIX (pread HAVE_PREAD)
-CHECK_FUNCTION_EXISTS_UNIX (pthread_attr_create HAVE_PTHREAD_ATTR_CREATE)
-CHECK_FUNCTION_EXISTS_UNIX (pthread_attr_getstacksize HAVE_PTHREAD_ATTR_GETSTACKSIZE)
-CHECK_FUNCTION_EXISTS_UNIX (pthread_attr_setscope HAVE_PTHREAD_ATTR_SETSCOPE)
-CHECK_FUNCTION_EXISTS_UNIX (pthread_attr_setstacksize HAVE_PTHREAD_ATTR_SETSTACKSIZE)
-CHECK_FUNCTION_EXISTS_UNIX (pthread_condattr_create HAVE_PTHREAD_CONDATTR_CREATE)
-CHECK_FUNCTION_EXISTS_UNIX (pthread_condattr_setclock HAVE_PTHREAD_CONDATTR_SETCLOCK)
-CHECK_FUNCTION_EXISTS_UNIX (pthread_init HAVE_PTHREAD_INIT)
-CHECK_FUNCTION_EXISTS_UNIX (pthread_key_delete HAVE_PTHREAD_KEY_DELETE)
-CHECK_FUNCTION_EXISTS_UNIX (pthread_rwlock_rdlock HAVE_PTHREAD_RWLOCK_RDLOCK)
-CHECK_FUNCTION_EXISTS_UNIX (pthread_sigmask HAVE_PTHREAD_SIGMASK)
-CHECK_FUNCTION_EXISTS_UNIX (pthread_threadmask HAVE_PTHREAD_THREADMASK)
-CHECK_FUNCTION_EXISTS_UNIX (pthread_yield_np HAVE_PTHREAD_YIELD_NP)
+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 (pread HAVE_PREAD)
+CHECK_FUNCTION_EXISTS (pthread_attr_create HAVE_PTHREAD_ATTR_CREATE)
+CHECK_FUNCTION_EXISTS (pthread_attr_getstacksize HAVE_PTHREAD_ATTR_GETSTACKSIZE)
+CHECK_FUNCTION_EXISTS (pthread_attr_setscope HAVE_PTHREAD_ATTR_SETSCOPE)
+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_init HAVE_PTHREAD_INIT)
+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_UNIX (readdir_r HAVE_READDIR_R)
-CHECK_FUNCTION_EXISTS_UNIX (readlink HAVE_READLINK)
-CHECK_FUNCTION_EXISTS_UNIX (re_comp HAVE_RE_COMP)
-CHECK_FUNCTION_EXISTS_UNIX (regcomp HAVE_REGCOMP)
-CHECK_FUNCTION_EXISTS_UNIX (realpath HAVE_REALPATH)
+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_UNIX (rwlock_init HAVE_RWLOCK_INIT)
-CHECK_FUNCTION_EXISTS_UNIX (sched_yield HAVE_SCHED_YIELD)
-CHECK_FUNCTION_EXISTS_UNIX (setenv HAVE_SETENV)
+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_UNIX (setfd HAVE_SETFD)
-CHECK_FUNCTION_EXISTS_UNIX (sigaction HAVE_SIGACTION)
-CHECK_FUNCTION_EXISTS_UNIX (sigthreadmask HAVE_SIGTHREADMASK)
-CHECK_FUNCTION_EXISTS_UNIX (sigwait HAVE_SIGWAIT)
-CHECK_FUNCTION_EXISTS_UNIX (sigaddset HAVE_SIGADDSET)
-CHECK_FUNCTION_EXISTS_UNIX (sigemptyset HAVE_SIGEMPTYSET)
-CHECK_FUNCTION_EXISTS_UNIX (sighold HAVE_SIGHOLD) 
-CHECK_FUNCTION_EXISTS_UNIX (sigset HAVE_SIGSET)
-CHECK_FUNCTION_EXISTS_UNIX (sleep HAVE_SLEEP)
+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_UNIX (stpcpy HAVE_STPCPY)
+CHECK_FUNCTION_EXISTS (stpcpy HAVE_STPCPY)
 CHECK_FUNCTION_EXISTS (strcoll HAVE_STRCOLL)
 CHECK_FUNCTION_EXISTS (strerror HAVE_STRERROR)
-CHECK_FUNCTION_EXISTS_UNIX (strlcpy HAVE_STRLCPY)
+CHECK_FUNCTION_EXISTS (strlcpy HAVE_STRLCPY)
 CHECK_FUNCTION_EXISTS (strnlen HAVE_STRNLEN)
-CHECK_FUNCTION_EXISTS_UNIX (strlcat HAVE_STRLCAT)
-CHECK_FUNCTION_EXISTS_UNIX (strsignal HAVE_STRSIGNAL)
-CHECK_FUNCTION_EXISTS_UNIX (fgetln HAVE_FGETLN)
+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 (strsep HAVE_STRSEP)
 CHECK_FUNCTION_EXISTS (strstr HAVE_STRSTR)
-CHECK_FUNCTION_EXISTS_UNIX (strtok_r HAVE_STRTOK_R)
+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)
@@ -385,46 +385,46 @@ 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_UNIX (shmat HAVE_SHMAT) 
-CHECK_FUNCTION_EXISTS_UNIX (shmctl HAVE_SHMCTL)
-CHECK_FUNCTION_EXISTS_UNIX (shmdt HAVE_SHMDT)
-CHECK_FUNCTION_EXISTS_UNIX (shmget HAVE_SHMGET)
+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_UNIX (thr_setconcurrency HAVE_THR_SETCONCURRENCY)
-CHECK_FUNCTION_EXISTS_UNIX (thr_yield HAVE_THR_YIELD)
-CHECK_FUNCTION_EXISTS_UNIX (vasprintf HAVE_VASPRINTF)
+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_UNIX (vprintf HAVE_VPRINTF)
-CHECK_FUNCTION_EXISTS_UNIX (valloc HAVE_VALLOC)
-CHECK_FUNCTION_EXISTS_UNIX (memalign HAVE_MEMALIGN)
-CHECK_FUNCTION_EXISTS_UNIX (chown HAVE_CHOWN)
-CHECK_FUNCTION_EXISTS_UNIX (nl_langinfo HAVE_NL_LANGINFO)
+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)
 
 #--------------------------------------------------------------------
 # Support for WL#2373 (Use cycle counter for timing)
 #--------------------------------------------------------------------
 
-CHECK_INCLUDE_FILES_UNIX(time.h HAVE_TIME_H)
-CHECK_INCLUDE_FILES_UNIX(sys/time.h HAVE_SYS_TIME_H)
-CHECK_INCLUDE_FILES_UNIX(sys/times.h HAVE_SYS_TIMES_H)
-CHECK_INCLUDE_FILES_UNIX(asm/msr.h HAVE_ASM_MSR_H)
+CHECK_INCLUDE_FILES(time.h HAVE_TIME_H)
+CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H)
+CHECK_INCLUDE_FILES(sys/times.h HAVE_SYS_TIMES_H)
+CHECK_INCLUDE_FILES(asm/msr.h HAVE_ASM_MSR_H)
 #msr.h has rdtscll()
 
-CHECK_INCLUDE_FILES_UNIX(ia64intrin.h HAVE_IA64INTRIN_H)
+CHECK_INCLUDE_FILES(ia64intrin.h HAVE_IA64INTRIN_H)
 
-CHECK_FUNCTION_EXISTS_UNIX(times HAVE_TIMES)
-CHECK_FUNCTION_EXISTS_UNIX(gettimeofday HAVE_GETTIMEOFDAY)
-CHECK_FUNCTION_EXISTS_UNIX(read_real_time HAVE_READ_REAL_TIME)
+CHECK_FUNCTION_EXISTS(times HAVE_TIMES)
+CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
+CHECK_FUNCTION_EXISTS(read_real_time HAVE_READ_REAL_TIME)
 # This should work on AIX.
 
-CHECK_FUNCTION_EXISTS_UNIX(ftime HAVE_FTIME)
+CHECK_FUNCTION_EXISTS(ftime HAVE_FTIME)
 # This is still a normal call for milliseconds.
 
-CHECK_FUNCTION_EXISTS_UNIX(time HAVE_TIME)
+CHECK_FUNCTION_EXISTS(time HAVE_TIME)
 # We can use time() on Macintosh if there is no ftime().
 
-CHECK_FUNCTION_EXISTS_UNIX(rdtscll HAVE_RDTSCLL)
+CHECK_FUNCTION_EXISTS(rdtscll HAVE_RDTSCLL)
 # I doubt that we'll ever reach the check for this.
 
 
@@ -432,14 +432,14 @@ CHECK_FUNCTION_EXISTS_UNIX(rdtscll HAVE_RDTSCLL)
 # Tests for symbols
 #
 
-CHECK_SYMBOL_EXISTS_UNIX(sys_errlist "stdio.h" HAVE_SYS_ERRLIST)
-CHECK_SYMBOL_EXISTS_UNIX(madvise "sys/mman.h" HAVE_DECL_MADVISE)
+CHECK_SYMBOL_EXISTS(sys_errlist "stdio.h" HAVE_SYS_ERRLIST)
+CHECK_SYMBOL_EXISTS(madvise "sys/mman.h" HAVE_DECL_MADVISE)
 CHECK_SYMBOL_EXISTS(tzname "time.h" HAVE_TZNAME)
-CHECK_SYMBOL_EXISTS_UNIX(lrand48 "stdlib.h" HAVE_LRAND48)
-CHECK_SYMBOL_EXISTS_UNIX(getpagesize "unistd.h" HAVE_GETPAGESIZE)
-CHECK_SYMBOL_EXISTS_UNIX(TIOCGWINSZ "sys/ioctl.h" GWINSZ_IN_SYS_IOCTL)
-CHECK_SYMBOL_EXISTS_UNIX(FIONREAD "sys/ioctl.h" FIONREAD_IN_SYS_IOCTL)
-CHECK_SYMBOL_EXISTS_UNIX(TIOCSTAT "sys/ioctl.h" TIOCSTAT_IN_SYS_IOCTL)
+CHECK_SYMBOL_EXISTS(lrand48 "stdlib.h" HAVE_LRAND48)
+CHECK_SYMBOL_EXISTS(getpagesize "unistd.h" HAVE_GETPAGESIZE)
+CHECK_SYMBOL_EXISTS(TIOCGWINSZ "sys/ioctl.h" GWINSZ_IN_SYS_IOCTL)
+CHECK_SYMBOL_EXISTS(FIONREAD "sys/ioctl.h" FIONREAD_IN_SYS_IOCTL)
+CHECK_SYMBOL_EXISTS(TIOCSTAT "sys/ioctl.h" TIOCSTAT_IN_SYS_IOCTL)
 CHECK_SYMBOL_EXISTS(gettimeofday "sys/time.h" HAVE_GETTIMEOFDAY)
 
 CHECK_SYMBOL_EXISTS(finite  "math.h" HAVE_FINITE_IN_MATH_H)
@@ -655,7 +655,7 @@ ELSE()
 ENDIF()
 ENDIF()
 
-CHECK_CXX_SOURCE_COMPILES_UNIX("
+CHECK_CXX_SOURCE_COMPILES("
 #include <pthread.h>
 int main()
 {
@@ -707,8 +707,8 @@ ELSE(SIGNAL_RETURN_TYPE_IS_VOID)
 ENDIF(SIGNAL_RETURN_TYPE_IS_VOID)
 
 
-CHECK_INCLUDE_FILES_UNIX("time.h;sys/time.h" TIME_WITH_SYS_TIME)
-CHECK_SYMBOL_EXISTS_UNIX(O_NONBLOCK "unistd.h;fcntl.h" HAVE_FCNTL_NONBLOCK)
+CHECK_INCLUDE_FILES("time.h;sys/time.h" TIME_WITH_SYS_TIME)
+CHECK_SYMBOL_EXISTS(O_NONBLOCK "unistd.h;fcntl.h" HAVE_FCNTL_NONBLOCK)
 IF(NOT HAVE_FCNTL_NONBLOCK)
  SET(NO_FCNTL_NONBLOCK 1)
 ENDIF()
@@ -754,8 +754,8 @@ IF(NOT CMAKE_CROSSCOMPILING AND NOT MSVC)
   ENDIF()
 ENDIF()
   
-CHECK_SYMBOL_EXISTS_UNIX(tcgetattr "termios.h" HAVE_TCGETATTR 1)
-CHECK_INCLUDE_FILES_UNIX(sys/ioctl.h HAVE_SYS_IOCTL 1)
+CHECK_SYMBOL_EXISTS(tcgetattr "termios.h" HAVE_TCGETATTR 1)
+CHECK_INCLUDE_FILES(sys/ioctl.h HAVE_SYS_IOCTL 1)
 
 #
 # Check type of signal routines (posix, 4.2bsd, 4.1bsd or v7)
@@ -844,7 +844,7 @@ CHECK_CXX_SOURCE_COMPILES("
     HAVE_CXX_NEW
 )
 
-CHECK_CXX_SOURCE_COMPILES_UNIX("
+CHECK_CXX_SOURCE_COMPILES("
     #undef inline
     #if !defined(SCO) && !defined(__osf__) && !defined(_REENTRANT)
     #define _REENTRANT
@@ -866,7 +866,7 @@ CHECK_CXX_SOURCE_COMPILES_UNIX("
   "
   HAVE_SOLARIS_STYLE_GETHOST)
 
-CHECK_CXX_SOURCE_COMPILES_UNIX("
+CHECK_CXX_SOURCE_COMPILES("
     #undef inline
     #if !defined(SCO) && !defined(__osf__) && !defined(_REENTRANT)
     #define _REENTRANT
@@ -885,7 +885,7 @@ CHECK_CXX_SOURCE_COMPILES_UNIX("
     }"
     HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE)
 
-CHECK_CXX_SOURCE_COMPILES_UNIX("
+CHECK_CXX_SOURCE_COMPILES("
     #undef inline
     #if !defined(SCO) && !defined(__osf__) && !defined(_REENTRANT)
     #define _REENTRANT