summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2003-01-10 20:52:45 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2003-01-10 20:52:45 (GMT)
commit3aa781ab6db8b07adaf3070c8f3371683fb75fbd (patch)
tree66e64d2e8dfbfd8e26197ba0ee4b8a3239d380c1
parentdce52e7c94ab4b301e1f6ce9341f29c733f495ba (diff)
downloadCMake-3aa781ab6db8b07adaf3070c8f3371683fb75fbd.zip
CMake-3aa781ab6db8b07adaf3070c8f3371683fb75fbd.tar.gz
CMake-3aa781ab6db8b07adaf3070c8f3371683fb75fbd.tar.bz2
AIX fixes
-rw-r--r--Source/CTest/Curl/CMakeLists.txt12
-rw-r--r--Source/CTest/Curl/config.h.in2
2 files changed, 13 insertions, 1 deletions
diff --git a/Source/CTest/Curl/CMakeLists.txt b/Source/CTest/Curl/CMakeLists.txt
index f8e970b..3e42d79 100644
--- a/Source/CTest/Curl/CMakeLists.txt
+++ b/Source/CTest/Curl/CMakeLists.txt
@@ -9,6 +9,10 @@ SET(OPERATING_SYSTEM ${CMAKE_SYSTEM_NAME})
SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
SET(CMAKE_REQUIRED_FLAGS ${CMAKE_ANSI_CFLAGS})
+IF(${CMAKE_SYSTEM_NAME} MATCHES AIX)
+ SET(_ALL_SOURCE 1)
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES AIX)
+
INCLUDE (${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
INCLUDE (${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
INCLUDE (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
@@ -308,6 +312,14 @@ IF(NOT HAVE_IN_ADDR_T)
SET(in_addr_t "unsigned long")
ENDIF(NOT HAVE_IN_ADDR_T)
+IF(NOT HAVE_LIBZ)
+ SET(HAVE_ZLIB_H 0)
+ENDIF(NOT HAVE_LIBZ)
+
+IF(NOT HAVE_ZLIB_H)
+ SET(HAVE_LIBZ 0)
+ENDIF(NOT HAVE_ZLIB_H)
+
SET(HAVE_SOME_NONBLOCK 0)
FOREACH(CURL_TEST
HAVE_FIONBIO
diff --git a/Source/CTest/Curl/config.h.in b/Source/CTest/Curl/config.h.in
index 560207f..980b972 100644
--- a/Source/CTest/Curl/config.h.in
+++ b/Source/CTest/Curl/config.h.in
@@ -469,7 +469,7 @@
System headers sometimes define this.
We just want to avoid a redefinition error message. */
#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
+#cmakedefine _ALL_SOURCE ${_ALL_SOURCE}
#endif
/* Number of bits in a file offset, on hosts where this is settable. */