From: Wouter Wijngaards <wouter@NLnetLabs.nl>
Date: Fri, 3 May 2013 09:36:36 +0000 (+0000)
Subject: - update acx_nlnetlabs.m4 to v23, sleep w32 fix.
X-Git-Tag: release-1.6.17rc1~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba7cf2e63572aedb57c7ab2314295ab1b83bb69e;p=thirdparty%2Fldns.git

- update acx_nlnetlabs.m4 to v23, sleep w32 fix.
---

diff --git a/acx_nlnetlabs.m4 b/acx_nlnetlabs.m4
index bc18187f..e393817e 100644
--- a/acx_nlnetlabs.m4
+++ b/acx_nlnetlabs.m4
@@ -2,7 +2,8 @@
 # Copyright 2009, Wouter Wijngaards, NLnet Labs.   
 # BSD licensed.
 #
-# Version 22
+# Version 23
+# 2013-05-03 Update W32_SLEEP for newer mingw that links but not defines it.
 # 2013-03-22 Fix ACX_RSRC_VERSION for long version numbers.
 # 2012-02-09 Fix AHX_MEMCMP_BROKEN with undef in compat/memcmp.h.
 # 2012-01-20 Fix COMPILER_FLAGS_UNBOUND for gcc 4.6.2 assigned-not-used-warns.
@@ -1209,7 +1210,7 @@ struct tm *gmtime_r(const time_t *timep, struct tm *result);
 dnl provide w32 compat definition for sleep
 AC_DEFUN([AHX_CONFIG_W32_SLEEP],
 [
-#ifndef HAVE_SLEEP
+#if !defined(HAVE_SLEEP) || defined(HAVE_WINDOWS_H)
 #define sleep(x) Sleep((x)*1000) /* on win32 */
 #endif /* HAVE_SLEEP */
 ])