AIX 5.2 and newer have threadsafe getaddrinfo.

Add some comments to better understand what the regex's pretend to achieve.

diff --git a/ares/m4/cares-functions.m4 b/ares/m4/cares-functions.m4
index 6a4eb05..898a4ea 100644 (file)
--- 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 34
+# serial 35
 
 
 dnl CARES_INCLUDES_ARPA_INET
@@ -1011,34 +1011,52 @@ AC_DEFUN([CARES_CHECK_FUNC_GETADDRINFO], [
   if test "$ac_cv_func_getaddrinfo" = "yes"; then
     AC_MSG_CHECKING([if getaddrinfo is threadsafe])
     case $host_os in
+      aix[[1234]].* | aix5.[[01]].*)
+        dnl aix 5.1 and older
+        tst_tsafe_getaddrinfo="no"
+        ;;
+      aix*)
+        dnl aix 5.2 and newer
+        tst_tsafe_getaddrinfo="yes"
+        ;;
       darwin[[12354678]].*)
+        dnl darwin 8.X and older
         tst_tsafe_getaddrinfo="no"
         ;;
       darwin*)
+        dnl darwin 9.X and newer
         tst_tsafe_getaddrinfo="yes"
         ;;
       dragonflybsd*)
+        dnl dragonflybsd any version
         tst_tsafe_getaddrinfo="yes"
         ;;
       freebsd[[1234]].* | freebsd5.[[1234]]*)
+        dnl freebsd 5.4 and older
         tst_tsafe_getaddrinfo="no"
         ;;
       freebsd*)
+        dnl freebsd 5.5 and newer
         tst_tsafe_getaddrinfo="yes"
         ;;
       hpux[[123456789]].* | hpux10.* | hpux11.0* | hpux11.10*)
+        dnl hpux 11.10 and older
         tst_tsafe_getaddrinfo="no"
         ;;
       hpux*)
+        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"
         ;;
       netbsd*)
+        dnl netbsd 4.X and newer
         tst_tsafe_getaddrinfo="yes"
         ;;
     esac

diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4
index 5cab3c0..8154393 100644 (file)
--- 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 56
+# serial 57
 
 
 dnl CURL_INCLUDES_ARPA_INET
@@ -1635,34 +1635,52 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
   if test "$ac_cv_func_getaddrinfo" = "yes"; then
     AC_MSG_CHECKING([if getaddrinfo is threadsafe])
     case $host_os in
+      aix[[1234]].* | aix5.[[01]].*)
+        dnl aix 5.1 and older
+        tst_tsafe_getaddrinfo="no"
+        ;;
+      aix*)
+        dnl aix 5.2 and newer
+        tst_tsafe_getaddrinfo="yes"
+        ;;
       darwin[[12354678]].*)
+        dnl darwin 8.X and older
         tst_tsafe_getaddrinfo="no"
         ;;
       darwin*)
+        dnl darwin 9.X and newer
         tst_tsafe_getaddrinfo="yes"
         ;;
       dragonflybsd*)
+        dnl dragonflybsd any version
         tst_tsafe_getaddrinfo="yes"
         ;;
       freebsd[[1234]].* | freebsd5.[[1234]]*)
+        dnl freebsd 5.4 and older
         tst_tsafe_getaddrinfo="no"
         ;;
       freebsd*)
+        dnl freebsd 5.5 and newer
         tst_tsafe_getaddrinfo="yes"
         ;;
       hpux[[123456789]].* | hpux10.* | hpux11.0* | hpux11.10*)
+        dnl hpux 11.10 and older
         tst_tsafe_getaddrinfo="no"
         ;;
       hpux*)
+        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"
         ;;
       netbsd*)
+        dnl netbsd 4.X and newer
         tst_tsafe_getaddrinfo="yes"
         ;;
     esac