diff options
| -rw-r--r-- | ares/m4/cares-functions.m4 | 22 | ||||
| -rw-r--r-- | m4/curl-functions.m4 | 22 |
2 files changed, 20 insertions, 24 deletions
diff --git a/ares/m4/cares-functions.m4 b/ares/m4/cares-functions.m4 index ec9ff9a2e..8d174d8aa 100644 --- a/ares/m4/cares-functions.m4 +++ b/ares/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 diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4 index d3a783112..df3a5850c 100644 --- a/m4/curl-functions.m4 +++ b/m4/curl-functions.m4 @@ -22,7 +22,7 @@ #*************************************************************************** # File version for 'aclocal' use. Keep it a single number. -# serial 58 +# serial 59 dnl CURL_INCLUDES_ARPA_INET @@ -1651,10 +1651,6 @@ AC_DEFUN([CURL_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" @@ -1671,10 +1667,6 @@ AC_DEFUN([CURL_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" @@ -1683,15 +1675,21 @@ AC_DEFUN([CURL_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 |