From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 17 May 2021 06:43:46 +0000 (+0200)
Subject: - Fix #489: Compile using MSYS2 MinGW 64-bit.
X-Git-Tag: release-1.13.2rc1~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5e0207a5e1aaad8b255713a9921656b57b1d3d8;p=thirdparty%2Funbound.git

- Fix #489: Compile using MSYS2 MinGW 64-bit.
---

diff --git a/acx_nlnetlabs.m4 b/acx_nlnetlabs.m4
index dd8d8c329..ad8fb5007 100644
--- a/acx_nlnetlabs.m4
+++ b/acx_nlnetlabs.m4
@@ -2,7 +2,9 @@
 # Copyright 2009, Wouter Wijngaards, NLnet Labs.   
 # BSD licensed.
 #
-# Version 38
+# Version 39
+# 2021-05-17 fix nonblocking socket test from grep on mingw32 to mingw for
+# 	     64bit compatibility.
 # 2021-03-24 fix ACX_FUNC_DEPRECATED to use CPPFLAGS and CFLAGS.
 # 2021-01-05 fix defun for aclocal
 # 2021-01-05 autoconf 2.70 autoupdate and fixes, no AC_TRY_COMPILE
@@ -915,7 +917,7 @@ dnl a nonblocking socket do not work, a new call to select is necessary.
 AC_DEFUN([ACX_CHECK_NONBLOCKING_BROKEN],
 [
 AC_MSG_CHECKING([if nonblocking sockets work])
-if echo $target | grep mingw32 >/dev/null; then 
+if echo $target | grep mingw >/dev/null; then
 	AC_MSG_RESULT([no (windows)])
 	AC_DEFINE([NONBLOCKING_IS_BROKEN], 1, [Define if the network stack does not fully support nonblocking io (causes lower performance).])
 else
diff --git a/configure b/configure
index fb3bcffe2..d0050b1e6 100755
--- a/configure
+++ b/configure
@@ -4204,9 +4204,9 @@ case "$exec_prefix" in
 esac
 
 # are we on MinGW?
-if uname -s 2>&1 | grep MINGW32 >/dev/null; then on_mingw="yes"
+if uname -s 2>&1 | grep MINGW >/dev/null; then on_mingw="yes"
 else
-	if echo $host $target | grep mingw32 >/dev/null; then on_mingw="yes"
+	if echo $host $target | grep mingw >/dev/null; then on_mingw="yes"
 	else on_mingw="no"; fi
 fi
 
@@ -15927,7 +15927,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if nonblocking sockets work" >&5
 $as_echo_n "checking if nonblocking sockets work... " >&6; }
-if echo $target | grep mingw32 >/dev/null; then
+if echo $target | grep mingw >/dev/null; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (windows)" >&5
 $as_echo "no (windows)" >&6; }
 
diff --git a/configure.ac b/configure.ac
index 62bcee1df..9abf2299f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,9 +147,9 @@ case "$exec_prefix" in
 esac
 
 # are we on MinGW?
-if uname -s 2>&1 | grep MINGW32 >/dev/null; then on_mingw="yes"
+if uname -s 2>&1 | grep MINGW >/dev/null; then on_mingw="yes"
 else 
-	if echo $host $target | grep mingw32 >/dev/null; then on_mingw="yes"
+	if echo $host $target | grep mingw >/dev/null; then on_mingw="yes"
 	else on_mingw="no"; fi
 fi
 
diff --git a/doc/Changelog b/doc/Changelog
index aaa1561e0..3b30b6f07 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+15 May 2021: Wouter
+	- Fix #489: Compile using MSYS2 MinGW 64-bit.
+
 12 May 2021: Wouter
 	- Fix that auth-zone zonefiles use last TTL if no TTL is specified.