Andreas Faerber and Scott McCreary made (lib)curl build for the Haiku OS

diff --git a/CHANGES b/CHANGES
index 519338032726ed7e193bb80bf4811d040744e6ff..95852e32ac38670e96055f84c7b0827520deff30 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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 c3d7b777832965fb48ef4ec54aeacf1b0f4385ff..67075ad2fdb1a7854a7049f82c64a096a1de86df 100644 (file)
--- 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 081fb6d6dc47630c8dad4ea5c8b3eabd80f4574e..227a54bd5b74de301611dc316efea9567e40a0b8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -592,6 +592,15 @@ then
   ])
 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

diff --git a/lib/select.c b/lib/select.c
index 847933ee9c4c8e8981059a3820eac7c5813bd404..7d6a6234ff73df1f56da101b29de8022cca4c331 100644 (file)
--- 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