@@ -454,10 +454,12 @@
 		], [
 			AC_MSG_RESULT(no)
 		])
 		;;
 esac
+
+AC_CHECK_FUNCS(strerror_r)
 
 AC_CHECK_LIB(m, fmod, LIBS="$LIBS -lm")
 
 AC_CHECK_FUNC(asprintf, [
 	case "$host" in
@@ -853,12 +855,10 @@
 			AC_MSG_RESULT($have_threadsafe_getaddrinfo)
 		])
 	], [
 		AC_MSG_RESULT(no)
 	])
-
-	AC_CHECK_FUNCS([h_errno hstrerror])
 ])
 
 AS_IF([test x"$enable_sockets" != x"no" -a x"$enable_threads" != x"no"], [
 	AC_SUBST(OFHTTPCLIENTTESTS_M, "OFHTTPClientTests.m")
 ])