From a077fb8c099e90523d1365bbd9f2db8328a46ca1 Mon Sep 17 00:00:00 2001
From: Niels Provos <provos@gmail.com>
Date: Thu, 22 Jan 2009 02:47:35 +0000
Subject: [PATCH] rename sys/signal.h to signal.h; configure m4 macro dir; this
 assist with compilation on Haiku

svn:r1033
---
 Makefile.am         | 1 +
 configure.in        | 2 ++
 test/bench.c        | 2 +-
 test/regress.c      | 2 +-
 test/regress_dns.c  | 6 +++---
 test/regress_http.c | 2 +-
 test/regress_rpc.c  | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 47d177e1..0233bd38 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
 
 # This is the point release for libevent.  It shouldn't include any
 # a/b/c/d/e notations.
diff --git a/configure.in b/configure.in
index 0a31ad0d..908f3dfa 100644
--- a/configure.in
+++ b/configure.in
@@ -2,6 +2,8 @@ dnl configure.in for libevent
 dnl Dug Song <dugsong@monkey.org>
 AC_INIT(event.c)
 
+AC_CONFIG_MACRO_DIR([m4])
+
 AM_INIT_AUTOMAKE(libevent,1.4.99-trunk)
 AM_CONFIG_HEADER(config.h)
 
diff --git a/test/bench.c b/test/bench.c
index a4bfda0e..7719e05b 100644
--- a/test/bench.c
+++ b/test/bench.c
@@ -44,7 +44,7 @@
 #include <windows.h>
 #else
 #include <sys/socket.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <sys/resource.h>
 #endif
 #include <fcntl.h>
diff --git a/test/regress.c b/test/regress.c
index 00fc8f92..bfc09751 100644
--- a/test/regress.c
+++ b/test/regress.c
@@ -43,7 +43,7 @@
 #ifndef WIN32
 #include <sys/socket.h>
 #include <sys/wait.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <unistd.h>
 #include <netdb.h>
 #endif
diff --git a/test/regress_dns.c b/test/regress_dns.c
index c36df1fc..96a47041 100644
--- a/test/regress_dns.c
+++ b/test/regress_dns.c
@@ -42,7 +42,7 @@
 #include <sys/queue.h>
 #ifndef WIN32
 #include <sys/socket.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <unistd.h>
@@ -90,7 +90,7 @@ dns_gethostbyname_cb(int result, char type, int count, int ttl,
 
 	switch (type) {
 	case DNS_IPv6_AAAA: {
-#if defined(HAVE_STRUCT_IN6_ADDR) && defined(HAVE_INET_NTOP)
+#if defined(HAVE_STRUCT_IN6_ADDR) && defined(HAVE_INET_NTOP) && defined(INET6_ADDRSTRLEN)
 		struct in6_addr *in6_addrs = addresses;
 		char buf[INET6_ADDRSTRLEN+1];
 		int i;
@@ -297,7 +297,7 @@ dns_server_gethostbyname_cb(int result, char type, int count, int ttl,
 		break;
 	}
 	case DNS_IPv6_AAAA: {
-#if defined (HAVE_STRUCT_IN6_ADDR) && defined(HAVE_INET_NTOP)
+#if defined (HAVE_STRUCT_IN6_ADDR) && defined(HAVE_INET_NTOP) && defined(INET6_ADDRSTRLEN)
 		struct in6_addr *in6_addrs = addresses;
 		char buf[INET6_ADDRSTRLEN+1];
 		if (memcmp(&in6_addrs[0].s6_addr, "abcdefghijklmnop", 16)
diff --git a/test/regress_http.c b/test/regress_http.c
index e693066e..17c7a026 100644
--- a/test/regress_http.c
+++ b/test/regress_http.c
@@ -42,7 +42,7 @@
 #include <sys/queue.h>
 #ifndef WIN32
 #include <sys/socket.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <unistd.h>
 #include <netdb.h>
 #endif
diff --git a/test/regress_rpc.c b/test/regress_rpc.c
index 78ccd651..79f8b6c2 100644
--- a/test/regress_rpc.c
+++ b/test/regress_rpc.c
@@ -42,7 +42,7 @@
 #include <sys/queue.h>
 #ifndef WIN32
 #include <sys/socket.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <unistd.h>
 #include <netdb.h>
 #endif