Bug 19446 - HaikuOS support

Signed-off-by: Colin Walters <walters@verbum.org>

diff --git a/configure.in b/configure.in
index bd21a8c..88af4f6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -386,7 +386,7 @@ AC_DEFINE_UNQUOTED(DBUS_HAVE_ATOMIC_INT_COND, [$have_atomic_inc_cond],
                    [Always defined; expands to 1 if we have an atomic integer implementation, else 0])
 
 #### Various functions
-AC_CHECK_LIB(socket,socket)
+AC_SEARCH_LIBS(socket,[socket network])
 AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
 
 AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll)

diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index 8ce6566..30e7dff 100644 (file)
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -238,6 +238,19 @@ dbus_int32_t _dbus_atomic_dec (DBusAtomic *atomic);
 #define _DBUS_POLLHUP     0x2000
 /** Invalid request: fd not open */
 #define _DBUS_POLLNVAL    0x8000
+#elif defined(__HAIKU__)
+/** There is data to read */
+#define _DBUS_POLLIN      0x0001
+/** Writing now will not block */
+#define _DBUS_POLLOUT     0x0002
+/** Error condition */
+#define _DBUS_POLLERR     0x0004
+/** There is urgent data to read */
+#define _DBUS_POLLPRI     0x0020
+/** Hung up */
+#define _DBUS_POLLHUP     0x0080
+/** Invalid request: fd not open */
+#define _DBUS_POLLNVAL    0x1000
 #else
 /** There is data to read */
 #define _DBUS_POLLIN      0x0001