[cmake-commits] andy committed CMakeLists.txt 1.10.2.2 1.10.2.3 setup.h 1.1.10.1 1.1.10.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmcurl
In directory public:/mounts/ram/cvs-serv6969

Modified Files:
      Tag: CMake-Curl-7-16-1
	CMakeLists.txt setup.h 
Log Message:
ENH: Several windows fixes


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmcurl/CMakeLists.txt,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -d -r1.10.2.2 -r1.10.2.3
--- CMakeLists.txt	8 Mar 2007 19:11:38 -0000	1.10.2.2
+++ CMakeLists.txt	9 Mar 2007 16:35:07 -0000	1.10.2.3
@@ -92,7 +92,7 @@
   strdup.c
   strequal.c
   strerror.c
-  strtok.c
+  # strtok.c - specify later
   strtoofft.c
   telnet.c
   tftp.c
@@ -219,8 +219,11 @@
 ENDMACRO(CHECK_INCLUDE_FILE_CONCAT)
 
 # Check for header files
+CHECK_INCLUDE_FILE_CONCAT("ws2tcpip.h"       HAVE_WS2TCPIP_H)
+CHECK_INCLUDE_FILE_CONCAT("winsock2.h"       HAVE_WINSOCK2_H)
 CHECK_INCLUDE_FILE_CONCAT("stdio.h"          HAVE_STDIO_H)
 CHECK_INCLUDE_FILE_CONCAT("windows.h"        HAVE_WINDOWS_H)
+CHECK_INCLUDE_FILE_CONCAT("winsock.h"        HAVE_WINSOCK_H)
 CHECK_INCLUDE_FILE_CONCAT("stddef.h"         HAVE_STDDEF_H)
 CHECK_INCLUDE_FILE_CONCAT("sys/types.h"      HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILE_CONCAT("inttypes.h"       HAVE_INTTYPES_H)
@@ -276,9 +279,6 @@
 CHECK_INCLUDE_FILE_CONCAT("time.h"          HAVE_TIME_H)
 CHECK_INCLUDE_FILE_CONCAT("unistd.h"        HAVE_UNISTD_H)
 CHECK_INCLUDE_FILE_CONCAT("sys/utime.h"     HAVE_SYS_UTIME_H)
-CHECK_INCLUDE_FILE_CONCAT("winsock.h"       HAVE_WINSOCK_H)
-CHECK_INCLUDE_FILE_CONCAT("winsock2.h"      HAVE_WINSOCK2_H)
-CHECK_INCLUDE_FILE_CONCAT("ws2tcpip.h"      HAVE_WS2TCPIP_H)
 CHECK_INCLUDE_FILE_CONCAT("sockio.h"        HAVE_SOCKIO_H)
 CHECK_INCLUDE_FILE_CONCAT("sys/sockio.h"    HAVE_SYS_SOCKIO_H)
 CHECK_INCLUDE_FILE_CONCAT("x509.h"          HAVE_X509_H)
@@ -673,7 +673,8 @@
 
 INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${LIBCURL_BINARY_DIR})
-ADD_DEFINITIONS(-DHAVE_CONFIG_H)
+ADD_DEFINITIONS(-DHAVE_CONFIG_H
+  -DCURL_STATICLIB)
 CONFIGURE_FILE(${LIBCURL_SOURCE_DIR}/config.h.in
   ${LIBCURL_BINARY_DIR}/config.h)
 

Index: setup.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmcurl/setup.h,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.2
diff -u -d -r1.1.10.1 -r1.1.10.2
--- setup.h	8 Mar 2007 13:50:24 -0000	1.1.10.1
+++ setup.h	9 Mar 2007 16:35:07 -0000	1.1.10.2
@@ -51,6 +51,7 @@
 #include "config.h"
 #else
 
+/*
 #ifdef _WIN32_WCE
 #include "config-win32ce.h"
 #else
@@ -58,6 +59,7 @@
 #include "config-win32.h"
 #endif
 #endif
+*/
 
 #ifdef macintosh
 #include "config-mac.h"