@@ -1306,102 +1306,10 @@
 					"OFKernelEventObserver_select.m")
 			])
 			;;
 	esac
 
-	AC_MSG_CHECKING(for getaddrinfo)
-	AC_TRY_COMPILE([
-		#include <stddef.h>
-		#ifdef OF_HAVE_SYS_TYPES_H
-		# include <sys/types.h>
-		#endif
-		#ifdef HAVE_SYS_SOCKET_H
-		# include <sys/socket.h>
-		#endif
-		#ifdef HAVE_NETDB_H
-		# include <netdb.h>
-		#endif
-		#ifdef _WIN32
-		typedef unsigned char BOOL;
-		# include <ws2tcpip.h>
-		#endif
-	], [
-		struct addrinfo ai;
-		getaddrinfo(NULL, NULL, NULL, NULL);
-	], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_GETADDRINFO, 1, [Whether we have getaddrinfo()])
-
-		AS_IF([test x"$enable_threads" != x"no"], [
-			AC_MSG_CHECKING(whether getaddrinfo is thread-safe)
-
-			case "$host_os" in
-				darwin[[12345]].*)
-					have_threadsafe_getaddrinfo="no"
-					;;
-				darwin*)
-					have_threadsafe_getaddrinfo="yes"
-					;;
-				freebsd[[1234]].* | freebsd5.[[1234]]*)
-					have_threadsafe_getaddrinfo="no"
-					;;
-				freebsd*)
-					have_threadsafe_getaddrinfo="yes"
-					;;
-				netbsd[[123]].*)
-					have_threadsafe_getaddrinfo="no"
-					;;
-				netbsd*)
-					have_threadsafe_getaddrinfo="yes"
-					;;
-				solaris*)
-					have_threadsafe_getaddrinfo="yes"
-					;;
-				*)
-					have_threadsafe_getaddrinfo="unknown"
-					;;
-			esac
-
-			AS_IF([test x"$have_threadsafe_getaddrinfo" = \
-					x"unknown"], [
-				AC_EGREP_CPP(egrep_cpp_yes, [
-					#ifdef OF_HAVE_SYS_TYPES_H
-					# include <sys/types.h>
-					#endif
-					#ifdef HAVE_SYS_SOCKET_H
-					# include <sys/socket.h>
-					#endif
-					#ifdef HAVE_NETDB_H
-					# include <netdb.h>
-					#endif
-					#ifdef _WIN32
-					# define _WIN32_WINNT 0x0501
-					# include <windows.h>
-					# include <ws2tcpip.h>
-					#endif
-
-					#ifdef h_errno
-					egrep_cpp_yes
-					#end
-				], [
-					have_threadsafe_getaddrinfo="yes"
-				], [
-					have_threadsafe_getaddrinfo="no"
-				])
-			])
-
-			AS_IF([test x"$have_threadsafe_getaddrinfo" = x"yes"], [
-				AC_DEFINE(HAVE_THREADSAFE_GETADDRINFO, 1,
-					[Whether getaddrinfo is thread-safe])
-			])
-
-			AC_MSG_RESULT($have_threadsafe_getaddrinfo)
-		])
-	], [
-		AC_MSG_RESULT(no)
-	])
-
 	AS_IF([test x"$enable_threads" != x"no"], [
 		AC_SUBST(OFHTTPCLIENTTESTS_M, "OFHTTPClientTests.m")
 	])
 
 	AC_SUBST(OFDNS, "ofdns")