From 203637cd1db87583de23861db5a73416a0795109 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 5 Feb 2011 12:32:32 +0100
Subject: [PATCH] New module 'wmemchr', part 2.

---
 ChangeLog     | 4 ++--
 m4/wchar_h.m4 | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 082e7c84f8..41497ea227 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,8 +6,8 @@
 	* lib/wmemchr.c: New file.
 	* lib/wmemchr-impl.h: New file, from libutf8 with modifications.
 	* m4/wmemchr.m4: New file.
-	* m4/wchar_h.m4 (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WMEMCHR,
-	HAVE_WMEMCHR.
+	* m4/wchar_h.m4 (gl_WCHAR_H): Test whether wmemchr is declared.
+	(gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WMEMCHR, HAVE_WMEMCHR.
 	* modules/wchar (Makefile.am): Substitute GNULIB_WMEMCHR, HAVE_WMEMCHR.
 	* tests/test-wchar-c++.cc: Test the declaration of wmemchr.
 	* doc/posix-functions/wmemchr.texi: Mention the new module.
diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4
index b43756dbcb..9724d1389b 100644
--- a/m4/wchar_h.m4
+++ b/m4/wchar_h.m4
@@ -48,8 +48,10 @@ AC_DEFUN([gl_WCHAR_H],
 # include <time.h>
 #endif
 #include <wchar.h>
-    ]], [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb
-    wcsrtombs wcsnrtombs wcwidth])
+    ]],
+    [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb
+     wcsrtombs wcsnrtombs wcwidth wmemchr
+    ])
 ])
 
 dnl Check whether <wchar.h> is usable at all.
-- 
2.30.2