@@ -9,10 +9,11 @@
 AC_PROG_CPP
 AC_PROG_LN_S
 AC_PROG_EGREP
 
 CFLAGS="$CFLAGS -Wall"
+CPPFLAGS="$CPPFLAGS -D_RENTRANT"
 OBJCFLAGS="$OBJCFLAGS -Wall -fobjc-exceptions"
 LIBS="$LIBS -lobjc"
 
 AC_DEFINE(OF_CONFIG_H, 1, [Define so that we know we got our config.h])
 
@@ -64,20 +65,21 @@
 AC_MSG_RESULT($ac_cv_snprintf_useful_ret)
 
 test x"$have_asprintf" != x"yes" -a x"$ac_cv_snprintf_useful_ret" != x"yes" && \
 	AC_MSG_ERROR(No asprintf and no snprintf returning required space!)
 
-ACX_PTHREAD
+ACX_PTHREAD([
+	CPPLAGS="$CPPFLAGS $PTHREAD_CFLAGS"
+	LIBS="$LIBS $PTHREAD_LIBS"
+	], [
+	AC_MSG_ERROR(You need pthreads!)])
 
 AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32")
 
 AC_MSG_CHECKING(whether we have IPv6 support)
 AC_CACHE_VAL(ac_cv_have_ipv6, [
 	AC_TRY_RUN([
-		#include <stdlib.h>
-		#include <string.h>
-
 		#include <sys/types.h>
 		#include <sys/socket.h>
 		#include <netinet/in.h>
 
 		int
@@ -86,16 +88,10 @@
 			int fd;
 			struct sockaddr_in6 addr;
 
 			fd = socket(AF_INET6, SOCK_STREAM, 0);
 
-			/*
-			 * Do something with it to prevent an error due to
-			 * -Werror
-			 */
-			memset(&addr, 0, sizeof(addr));
-
 			exit(fd >= 0 ? 0 : 1);
 		}],
 		ac_cv_have_ipv6="yes",
 		ac_cv_have_ipv6="no",
 		ac_cv_have_ipv6="no")])