summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorNoah Misch <noah@leadboat.com>2014-08-28 20:36:27 -0400
committerNoah Misch <noah@leadboat.com>2014-08-28 20:36:27 -0400
commitec544a65c9090bc9da11ea384d1369fd552ca8b0 (patch)
treed06d1d6df0c9748c619965bcf6e939d07cbaa868 /configure
parent7f7eec89b66947e4098773cf286653b9c4f01c88 (diff)
downloadpostgresql-ec544a65c9090bc9da11ea384d1369fd552ca8b0.tar.gz
Always use our getaddrinfo.c on Windows.
Commit a16bac36eca8158cbf78987e95376f610095f792 let "configure" detect the system getaddrinfo() when building under 64-bit MinGW-w64. However, src/include/port/win32/sys/socket.h assumes all native Windows configurations use our replacement. This change placates buildfarm member jacana until we establish a plan for getaddrinfo() on Windows.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 3 insertions, 4 deletions
diff --git a/configure b/configure
index 25dc9befe6..bc4cf655d5 100755
--- a/configure
+++ b/configure
@@ -11840,10 +11840,9 @@ esac
# System's version of getaddrinfo(), if any, may be used only if we found
# a definition for struct addrinfo; see notes in src/include/getaddrinfo.h.
-# (Note: the AC_REPLACE_FUNCS probe fails on Windows, where the available
-# versions of getaddrinfo don't follow normal C call protocol. This is OK
-# because we want to use our own getaddrinfo.c on Windows anyway.)
-if test x"$ac_cv_type_struct_addrinfo" = xyes ; then
+# We use only our own getaddrinfo.c on Windows, but it's time to revisit that.
+if test x"$ac_cv_type_struct_addrinfo" = xyes && \
+ test "$PORTNAME" != "win32"; then
ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
if test "x$ac_cv_func_getaddrinfo" = xyes; then :
$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h