Stop using check_function_exists. Use check_symbol_exists

1 files changed, 41 insertions, 36 deletions

diff --git a/Source/CTest/Curl/CMakeLists.txt b/Source/CTest/Curl/CMakeLists.txt
index 38d4f0d..a1e63b3 100644
--- a/Source/CTest/Curl/CMakeLists.txt
+++ b/Source/CTest/Curl/CMakeLists.txt
@@ -70,9 +70,9 @@ SET(libCurl_SRCS
     )
 
 # On windows preload settings
-IF(WIN32)
-  INCLUDE(${LIBCURL_SOURCE_DIR}/Platforms/WindowsCache.cmake)
-ENDIF(WIN32)
+#IF(WIN32)
+#  INCLUDE(${LIBCURL_SOURCE_DIR}/Platforms/WindowsCache.cmake)
+#ENDIF(WIN32)
 
 # This macro checks if the symbol exists in the library and if it
 # does, it appends library to the list.
@@ -174,43 +174,48 @@ ENDIF(NOT HAVE_SIZEOF_SSIZE_T)
 FIND_FILE(RANDOM_FILE urandom /dev)
 
 # Check for some functions that are used
-CHECK_FUNCTION_EXISTS(socket            HAVE_SOCKET)
-CHECK_FUNCTION_EXISTS(poll              HAVE_POLL)
-CHECK_FUNCTION_EXISTS(select            HAVE_SELECT)
-CHECK_FUNCTION_EXISTS(strdup            HAVE_STRDUP)
-CHECK_FUNCTION_EXISTS(strstr            HAVE_STRSTR)
-CHECK_FUNCTION_EXISTS(strtok_r          HAVE_STRTOK_R)
-CHECK_FUNCTION_EXISTS(strftime          HAVE_STRFTIME)
-CHECK_FUNCTION_EXISTS(uname             HAVE_UNAME)
-CHECK_FUNCTION_EXISTS(strcasecmp        HAVE_STRCASECMP)
-CHECK_FUNCTION_EXISTS(stricmp           HAVE_STRICMP)
-CHECK_FUNCTION_EXISTS(strcmpi           HAVE_STRCMPI)
-CHECK_FUNCTION_EXISTS(gethostbyaddr     HAVE_GETHOSTBYADDR)
-CHECK_FUNCTION_EXISTS(gettimeofday      HAVE_GETTIMEOFDAY)
-CHECK_FUNCTION_EXISTS(inet_addr         HAVE_INET_ADDR)
-CHECK_FUNCTION_EXISTS(inet_ntoa         HAVE_INET_NTOA)
-CHECK_FUNCTION_EXISTS(inet_ntoa_r       HAVE_INET_NTOA_R)
-CHECK_FUNCTION_EXISTS(tcsetattr         HAVE_TCSETATTR)
-CHECK_FUNCTION_EXISTS(tcgetattr         HAVE_TCGETATTR)
-CHECK_FUNCTION_EXISTS(perror            HAVE_PERROR)
-CHECK_FUNCTION_EXISTS(closesocket       HAVE_CLOSESOCKET)
-CHECK_FUNCTION_EXISTS(setvbuf           HAVE_SETVBUF)
-CHECK_FUNCTION_EXISTS(signal            HAVE_SIGNAL)
-CHECK_FUNCTION_EXISTS(sigsetjmp         HAVE_SIGSETJMP)
-CHECK_FUNCTION_EXISTS(getpass_r         HAVE_GETPASS_R)
-CHECK_FUNCTION_EXISTS(strlcat           HAVE_STRLCAT)
-CHECK_FUNCTION_EXISTS(getpwuid          HAVE_GETPWUID)
-CHECK_FUNCTION_EXISTS(geteuid           HAVE_GETEUID)
-CHECK_FUNCTION_EXISTS(utime             HAVE_UTIME)
-CHECK_FUNCTION_EXISTS(RAND_status       HAVE_RAND_STATUS)
-CHECK_FUNCTION_EXISTS(RAND_screen       HAVE_RAND_SCREEN)
-CHECK_FUNCTION_EXISTS(RAND_egd          HAVE_RAND_EGD)
-CHECK_FUNCTION_EXISTS(gmtime            HAVE_GMTIME_R)
-CHECK_FUNCTION_EXISTS(localtime         HAVE_LOCALTIME_R)
+CHECK_SYMBOL_EXISTS(socket        "${CURL_INCLUDES}" HAVE_SOCKET)
+CHECK_SYMBOL_EXISTS(poll          "${CURL_INCLUDES}" HAVE_POLL)
+CHECK_SYMBOL_EXISTS(select        "${CURL_INCLUDES}" HAVE_SELECT)
+CHECK_SYMBOL_EXISTS(strdup        "${CURL_INCLUDES}" HAVE_STRDUP)
+CHECK_SYMBOL_EXISTS(strstr        "${CURL_INCLUDES}" HAVE_STRSTR)
+CHECK_SYMBOL_EXISTS(strtok_r      "${CURL_INCLUDES}" HAVE_STRTOK_R)
+CHECK_SYMBOL_EXISTS(strftime      "${CURL_INCLUDES}" HAVE_STRFTIME)
+CHECK_SYMBOL_EXISTS(uname         "${CURL_INCLUDES}" HAVE_UNAME)
+CHECK_SYMBOL_EXISTS(strcasecmp    "${CURL_INCLUDES}" HAVE_STRCASECMP)
+CHECK_SYMBOL_EXISTS(stricmp       "${CURL_INCLUDES}" HAVE_STRICMP)
+CHECK_SYMBOL_EXISTS(strcmpi       "${CURL_INCLUDES}" HAVE_STRCMPI)
+CHECK_SYMBOL_EXISTS(gethostbyaddr "${CURL_INCLUDES}" HAVE_GETHOSTBYADDR)
+CHECK_SYMBOL_EXISTS(gettimeofday  "${CURL_INCLUDES}" HAVE_GETTIMEOFDAY)
+CHECK_SYMBOL_EXISTS(inet_addr     "${CURL_INCLUDES}" HAVE_INET_ADDR)
+CHECK_SYMBOL_EXISTS(inet_ntoa     "${CURL_INCLUDES}" HAVE_INET_NTOA)
+CHECK_SYMBOL_EXISTS(inet_ntoa_r   "${CURL_INCLUDES}" HAVE_INET_NTOA_R)
+CHECK_SYMBOL_EXISTS(tcsetattr     "${CURL_INCLUDES}" HAVE_TCSETATTR)
+CHECK_SYMBOL_EXISTS(tcgetattr     "${CURL_INCLUDES}" HAVE_TCGETATTR)
+CHECK_SYMBOL_EXISTS(perror        "${CURL_INCLUDES}" HAVE_PERROR)
+CHECK_SYMBOL_EXISTS(closesocket   "${CURL_INCLUDES}" HAVE_CLOSESOCKET)
+CHECK_SYMBOL_EXISTS(setvbuf       "${CURL_INCLUDES}" HAVE_SETVBUF)
+CHECK_SYMBOL_EXISTS(sigsetjmp     "${CURL_INCLUDES}" HAVE_SIGSETJMP)
+CHECK_SYMBOL_EXISTS(getpass_r     "${CURL_INCLUDES}" HAVE_GETPASS_R)
+CHECK_SYMBOL_EXISTS(strlcat       "${CURL_INCLUDES}" HAVE_STRLCAT)
+CHECK_SYMBOL_EXISTS(getpwuid      "${CURL_INCLUDES}" HAVE_GETPWUID)
+CHECK_SYMBOL_EXISTS(geteuid       "${CURL_INCLUDES}" HAVE_GETEUID)
+CHECK_SYMBOL_EXISTS(utime         "${CURL_INCLUDES}" HAVE_UTIME)
+CHECK_SYMBOL_EXISTS(RAND_status   "${CURL_INCLUDES}" HAVE_RAND_STATUS)
+CHECK_SYMBOL_EXISTS(RAND_screen   "${CURL_INCLUDES}" HAVE_RAND_SCREEN)
+CHECK_SYMBOL_EXISTS(RAND_egd      "${CURL_INCLUDES}" HAVE_RAND_EGD)
+CHECK_SYMBOL_EXISTS(gmtime_r      "${CURL_INCLUDES}" HAVE_GMTIME_R)
+CHECK_SYMBOL_EXISTS(localtime_r   "${CURL_INCLUDES}" HAVE_LOCALTIME_R)
 
 CHECK_SYMBOL_EXISTS(gethostbyname_r "${CURL_INCLUDES};netdb.h" HAVE_GETHOSTBYNAME_R)
 CHECK_SYMBOL_EXISTS(gethostbyaddr_r "${CURL_INCLUDES};netdb.h" HAVE_GETHOSTBYADDR_R)
 
+CHECK_SYMBOL_EXISTS(signal        "${CURL_INCLUDES}" HAVE_SIGNAL_FUNC)
+CHECK_SYMBOL_EXISTS(SIGALRM       "${CURL_INCLUDES}" HAVE_SIGNAL_MACRO)
+IF(HAVE_SIGNAL_FUNC AND HAVE_SIGNAL_MACRO)
+  SET(HAVE_SIGNAL 1)
+ENDIF(HAVE_SIGNAL_FUNC AND HAVE_SIGNAL_MACRO)
+
 
 # sigaction and sigsetjmp are special. Use special mechanism for
 # detecting those, but only if previous attempt failed.