diff options
author | Daniel Stenberg <daniel@haxx.se> | 2008-05-26 15:09:28 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2008-05-26 15:09:28 +0000 |
commit | b97606f0b044abc9a299ef78e3096bf06dcd8870 (patch) | |
tree | 1ba65946001e1af49b8e195bbe453c5175ed9c94 | |
parent | f26154bfa99cd53b8fb87589f7cf1bd8663d1da4 (diff) |
Andreas Faerber and Scott McCreary made (lib)curl build for the Haiku OS
-rw-r--r-- | CHANGES | 3 | ||||
-rw-r--r-- | RELEASE-NOTES | 3 | ||||
-rw-r--r-- | configure.ac | 9 | ||||
-rw-r--r-- | lib/select.c | 2 |
4 files changed, 15 insertions, 2 deletions
@@ -7,6 +7,9 @@ Changelog +Daniel Stenberg (26 May 2008) +- Andreas Faerber and Scott McCreary made (lib)curl build for the Haiku OS. + Yang Tse (26 May 2008) - David Rosenstrauch reported that header files spnegohelp.h and openssl/objects.h were needed to compile SPNEGO support. diff --git a/RELEASE-NOTES b/RELEASE-NOTES index c3d7b7778..67075ad2f 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -36,6 +36,7 @@ This release includes the following bugfixes: o multi interface busy loop for CONNECT requests o internal time differences now use monotonic time source if available o several curl_multi_socket() fixes + o builds fine for Haiku OS This release includes the following known bugs: @@ -58,6 +59,6 @@ advice from friends like these: Rafa Muyo, Andre Guibert de Bruet, Brock Noland, Sandor Feldi, Stefan Krause, David Shaw, Norbert Frese, Bart Whiteley, Jean-Francois Bertrand, Ben Van Hof, Yuriy Sosov, Christopher Palow, Yang Tse, Liam Healy, Nikolai Kondrashov, - David Rosenstrauch + David Rosenstrauch, Andreas Faerber, Scott McCreary Thanks! (and sorry if I forgot to mention someone) diff --git a/configure.ac b/configure.ac index 081fb6d6d..227a54bd5 100644 --- a/configure.ac +++ b/configure.ac @@ -594,6 +594,15 @@ fi if test "$HAVE_GETHOSTBYNAME" != "1" then + dnl gethostbyname in the network lib - for Haiku OS + AC_CHECK_LIB(network, gethostbyname, + [HAVE_GETHOSTBYNAME="1" + LIBS="$LIBS -lnetwork" + ]) +fi + +if test "$HAVE_GETHOSTBYNAME" != "1" +then dnl gethostbyname in the net lib - for BeOS AC_CHECK_LIB(net, gethostbyname, [HAVE_GETHOSTBYNAME="1" diff --git a/lib/select.c b/lib/select.c index 847933ee9..7d6a6234f 100644 --- a/lib/select.c +++ b/lib/select.c @@ -34,7 +34,7 @@ #error "We can't compile without select() or poll() support." #endif -#ifdef __BEOS__ +#if defined(__BEOS__) && !defined(__HAIKU__) /* BeOS has FD_SET defined in socket.h */ #include <socket.h> #endif |