Use preprocessor to check for AI_V4MAPPED, AI_ALL and AI_IDN

ext/sockets/config.m4

@@ -12,45 +12,6 @@ if test "$PHP_SOCKETS" != "no"; then
   dnl Check for field ss_family in sockaddr_storage (missing in AIX until 5.3)
   AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family],,,[#include <sys/socket.h>])
 
-  dnl Check for AI_V4MAPPED flag
-  AC_CACHE_CHECK([if getaddrinfo supports AI_V4MAPPED],[ac_cv_gai_ai_v4mapped],
-  [
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <netdb.h>
-  ]], [[int flag = AI_V4MAPPED;]])],
-    [ac_cv_gai_ai_v4mapped=yes], [ac_cv_gai_ai_v4mapped=no])
-  ])
-
-  if test "$ac_cv_gai_ai_v4mapped" = yes; then
-    AC_DEFINE(HAVE_AI_V4MAPPED,1,[Whether you have AI_V4MAPPED])
-  fi
-
-  dnl Check for AI_ALL flag
-  AC_CACHE_CHECK([if getaddrinfo supports AI_ALL],[ac_cv_gai_ai_all],
-  [
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <netdb.h>
-  ]], [[int flag = AI_ALL;]])],
-    [ac_cv_gai_ai_all=yes], [ac_cv_gai_ai_all=no])
-  ])
-
-  if test "$ac_cv_gai_ai_all" = yes; then
-    AC_DEFINE(HAVE_AI_ALL,1,[Whether you have AI_ALL])
-  fi
-
-  dnl Check for AI_IDN flag
-  AC_CACHE_CHECK([if getaddrinfo supports AI_IDN],[ac_cv_gai_ai_idn],
-  [
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <netdb.h>
-  ]], [[int flag = AI_IDN;]])],
-      [ac_cv_gai_ai_idn=yes], [ac_cv_gai_ai_idn=no])
-  ])
-
-  if test "$ac_cv_gai_ai_idn" = yes; then
-    AC_DEFINE(HAVE_AI_IDN,1,[Whether you have AI_IDN])
-  fi
-
   dnl Check for struct ucred. Checking the header is not enough (DragonFlyBSD).
   AC_CHECK_TYPES([struct ucred],,,
     [#ifndef _GNU_SOURCE

ext/sockets/sockaddr_conv.c

@@ -29,7 +29,7 @@ int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket *php_
 
 		memset(&hints, 0, sizeof(struct addrinfo));
 		hints.ai_family = AF_INET6;
-#if HAVE_AI_V4MAPPED
+#ifdef AI_V4MAPPED
 		hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG;
 #else
 		hints.ai_flags = AI_ADDRCONFIG;

ext/sockets/sockets.stub.php

@@ -1591,14 +1591,14 @@
  * @cvalue AI_NUMERICHOST
  */
 const AI_NUMERICHOST = UNKNOWN;
-#if HAVE_AI_V4MAPPED
+#ifdef AI_V4MAPPED
 /**
  * @var int
  * @cvalue AI_V4MAPPED
  */
 const AI_V4MAPPED = UNKNOWN;
 #endif
-#if HAVE_AI_ALL
+#ifdef AI_ALL
 /**
  * @var int
  * @cvalue AI_ALL
@@ -1610,7 +1610,7 @@
  * @cvalue AI_ADDRCONFIG
  */
 const AI_ADDRCONFIG = UNKNOWN;
-#if HAVE_AI_IDN
+#ifdef AI_IDN
 /**
  * @var int
  * @cvalue AI_IDN