diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-08 20:45:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-10-29 20:43:45 (GMT) |
| commit | 4063f26b6502685fe7dfbd65ea517f3ee15d8bea (patch) | |
| tree | dacda00b76f0e10a68aaa98238c9e9964fd216cf /Utilities/cmcurl | |
| parent | 53b8df596f4b9c6ddbff408a1c00010a0c618f72 (diff) | |
| download | CMake-4063f26b6502685fe7dfbd65ea517f3ee15d8bea.zip CMake-4063f26b6502685fe7dfbd65ea517f3ee15d8bea.tar.gz CMake-4063f26b6502685fe7dfbd65ea517f3ee15d8bea.tar.bz2 | |
curl: Port to Haiku again
Re-apply change from commit v2.8.0~1683 (add initial support for HAIKU
OS, 2008-09-15) on updated upstream curl. However, leave out the part
that was reverted by commit v3.0.0-rc1~541^2~1 (Haiku: Remove outdated
preprocessor checks, 2013-10-05).
Diffstat (limited to 'Utilities/cmcurl')
| -rw-r--r-- | Utilities/cmcurl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Utilities/cmcurl/include/curl/curl.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index 0cd4f3a..ca5f34f 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -215,6 +215,8 @@ if(BEOS) check_library_exists_concat("bnetapi" closesocket HAVE_LIBBNETAPI) endif(BEOS) +check_library_exists_concat("network" recv HAVE_LIBNETWORK) + if(NOT NOT_NEED_LIBNSL) check_library_exists_concat("nsl" gethostbyname HAVE_LIBNSL) endif(NOT NOT_NEED_LIBNSL) diff --git a/Utilities/cmcurl/include/curl/curl.h b/Utilities/cmcurl/include/curl/curl.h index d40b2db..1df2fe4 100644 --- a/Utilities/cmcurl/include/curl/curl.h +++ b/Utilities/cmcurl/include/curl/curl.h @@ -82,7 +82,7 @@ #include <sys/time.h> #endif -#ifdef __BEOS__ +#if defined __BEOS__ || defined __HAIKU__ #include <support/SupportDefs.h> #endif |