version 5 of acx_nlnetlabs.m4

git-svn-id: file:///svn/unbound/trunk@1962 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/acx_nlnetlabs.m4 b/acx_nlnetlabs.m4
index 9648ecd61ab42513d1505ddb001cbec8a6e31910..2d1292257991b28a92dd6e6c80b841be74092bc4 100644 (file)
--- a/acx_nlnetlabs.m4
+++ b/acx_nlnetlabs.m4
@@ -2,8 +2,8 @@
 # Copyright 2009, Wouter Wijngaards, NLnet Labs.   
 # BSD licensed.
 #
-# Version 4
-# Changelog
+# Version 5
+# 2010-01-20 added AHX_COONFIG_STRLCAT
 # 2009-07-14 U_CHAR detection improved for windows crosscompile.
 #            added ACX_FUNC_MALLOC
 #            fixup some #if to #ifdef
@@ -55,6 +55,7 @@
 # AHX_CONFIG_INET_NTOP         - inet_ntop compat prototype
 # AHX_CONFIG_INET_ATON         - inet_aton compat prototype
 # AHX_CONFIG_MEMMOVE           - memmove compat prototype
+# AHX_CONFIG_STRLCAT           - strlcat compat prototype
 # AHX_CONFIG_STRLCPY           - strlcpy compat prototype
 # AHX_CONFIG_GMTIME_R          - gmtime_r compat prototype
 # AHX_CONFIG_W32_SLEEP         - w32 compat for sleep
@@ -1088,6 +1089,16 @@ void *memmove(void *dest, const void *src, size_t n);
 #endif
 ])
 
+dnl provide strlcat compat prototype.
+dnl $1: unique name for compat code
+AC_DEFUN([AHX_CONFIG_STRLCAT],
+[
+#ifndef HAVE_STRLCAT
+#define strlcat strlcat_$1
+size_t strlcat(char *dst, const char *src, size_t siz);
+#endif
+])
+
 dnl provide strlcpy compat prototype.
 dnl $1: unique name for compat code
 AC_DEFUN([AHX_CONFIG_STRLCPY],

diff --git a/doc/Changelog b/doc/Changelog
index 58cf99d0175d9b438a5e5d8e17f60ac45034d7dd..14d6793418f2ee7fc9d20e0b0caaafdf54ee2524 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+21 January 2010: Wouter
+       - acx_nlnetlabs.m4 synchronised with nsd's version.
+
 20 January 2010: Wouter
        - Fixup lookup trouble for parent-child domains on the first query.