diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/config.w32 | 14 | ||||
| -rw-r--r-- | win32/build/confutils.js | 6 |
2 files changed, 17 insertions, 3 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index db080d0bcf..11dca8cc1c 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -181,3 +181,17 @@ ADD_SOURCES("regex", "regcomp.c regerror.c regexec.c regfree.c"); STDOUT.WriteBlankLines(1); +/* Can we build with IPv6 support? */ +ARG_ENABLE("ipv6", "Disable IPv6 support (default is turn it on if available)", "yes"); + +var main_network_has_ipv6 = 0; +if (PHP_IPV6 == "yes") { + main_network_has_ipv6 = CHECK_HEADER_ADD_INCLUDE("ws2tcpip.h", "CFLAGS") ? 1 : 0; +} +if (main_network_has_ipv6) { + STDOUT.WriteLine("Enabling IPv6 support"); +} +AC_DEFINE('HAVE_GETADDRINFO', main_network_has_ipv6); +AC_DEFINE('HAVE_GAI_STRERROR', main_network_has_ipv6); +AC_DEFINE('HAVE_IPV6', main_network_has_ipv6); + diff --git a/win32/build/confutils.js b/win32/build/confutils.js index a126817b26..3275f18ae5 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.17 2003-12-05 02:41:00 wez Exp $ +// $Id: confutils.js,v 1.18 2003-12-06 00:00:31 wez Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -427,14 +427,14 @@ function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env if (typeof(p) == "string") { ADD_FLAG(flag_name, '/I "' + p + '" '); - have = 1; } else if (p == false) { /* not found in the defaults or the explicit paths, * so check the general extra includes; if we find * it here, no need to add another /I for it as we * already have it covered */ p = search_paths(header_name, PHP_EXTRA_INCLUDES, null); - } + } + have = p ? 1 : 0 sym = header_name.toUpperCase(); sym = sym.replace(new RegExp("[\\\\/\.-]", "g"), "_"); |