summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2009-11-13 20:03:45 +0000
committerYang Tse <yangsita@gmail.com>2009-11-13 20:03:45 +0000
commitccabe949dda62bc0365fe6e624ccaecb686c1968 (patch)
tree79db58e8a0da4ffaa42e75fb9793081711f4af75
parent3d2e078f2bb7a88cce8343c4fdb37036dc5f8eaf (diff)
downloadc-ares-ccabe949dda62bc0365fe6e624ccaecb686c1968.tar.gz
c-ares-ccabe949dda62bc0365fe6e624ccaecb686c1968.tar.bz2
c-ares-ccabe949dda62bc0365fe6e624ccaecb686c1968.zip
Assume that getaddrinfo is thread safe, unless hard coded
knowledge says the contrary or h_errno is not defined.
-rw-r--r--m4/cares-functions.m422
1 files changed, 10 insertions, 12 deletions
diff --git a/m4/cares-functions.m4 b/m4/cares-functions.m4
index ec9ff9a..8d174d8 100644
--- a/m4/cares-functions.m4
+++ b/m4/cares-functions.m4
@@ -16,7 +16,7 @@
#***************************************************************************
# File version for 'aclocal' use. Keep it a single number.
-# serial 36
+# serial 37
dnl CARES_INCLUDES_ARPA_INET
@@ -1027,10 +1027,6 @@ AC_DEFUN([CARES_CHECK_FUNC_GETADDRINFO], [
dnl darwin 6.0 and mac os x 10.2.X and newer
tst_tsafe_getaddrinfo="yes"
;;
- dragonfly*)
- dnl dragonfly bsd any version
- tst_tsafe_getaddrinfo="yes"
- ;;
freebsd[[1234]].* | freebsd5.[[1234]]*)
dnl freebsd 5.4 and older
tst_tsafe_getaddrinfo="no"
@@ -1047,10 +1043,6 @@ AC_DEFUN([CARES_CHECK_FUNC_GETADDRINFO], [
dnl hpux 11.11 and newer
tst_tsafe_getaddrinfo="yes"
;;
- linux*)
- dnl linux any version
- tst_tsafe_getaddrinfo="yes"
- ;;
netbsd[[123]].*)
dnl netbsd 3.X and older
tst_tsafe_getaddrinfo="no"
@@ -1059,15 +1051,21 @@ AC_DEFUN([CARES_CHECK_FUNC_GETADDRINFO], [
dnl netbsd 4.X and newer
tst_tsafe_getaddrinfo="yes"
;;
+ *bsd*)
+ dnl All other bsd's
+ tst_tsafe_getaddrinfo="no"
+ ;;
esac
CURL_CHECK_DEF_CC([h_errno], [
$curl_includes_ws2tcpip
$curl_includes_sys_socket
$curl_includes_netdb
], [silent])
- if test "$tst_tsafe_getaddrinfo" = "yes" &&
- test "$curl_cv_have_def_h_errno" = "no"; then
- tst_tsafe_getaddrinfo="no"
+ if test "$curl_cv_have_def_h_errno" = "no"; then
+ tst_tsafe_getaddrinfo="no"
+ fi
+ if test "$tst_tsafe_getaddrinfo" = "unknown"; then
+ tst_tsafe_getaddrinfo="yes"
fi
AC_MSG_RESULT([$tst_tsafe_getaddrinfo])
if test "$tst_tsafe_getaddrinfo" = "yes"; then