X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fwmemchr.m4;h=5046dd2bd3a679d4681b5310d2b720df68ffec84;hb=a77413333408e54b8d6c4e19918098794cef4b4b;hp=b2a2052918a7c22a378bb20078027ea3d0c80380;hpb=0fd07686f8cf0e1f3e025f3598090d938dbf4e80;p=gnulib.git

diff --git a/m4/wmemchr.m4 b/m4/wmemchr.m4
index b2a205291..5046dd2bd 100644
--- a/m4/wmemchr.m4
+++ b/m4/wmemchr.m4
@@ -1,5 +1,5 @@
-# wmemchr.m4 serial 1
-dnl Copyright (C) 2011 Free Software Foundation, Inc.
+# wmemchr.m4 serial 3
+dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,9 +7,26 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_WMEMCHR],
 [
   AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
-  AC_CHECK_FUNCS_ONCE([wmemchr])
-  if test $ac_cv_func_wmemchr = no; then
+  dnl We cannot use AC_CHECK_FUNCS here, because the MSVC 9 header files
+  dnl provide this function as an inline function definition.
+  AC_CACHE_CHECK([for wmemchr], [gl_cv_func_wmemchr],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([[
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+]],
+          [[return ! wmemchr ((const wchar_t *) 0, (wchar_t) ' ', 0);]])
+       ],
+       [gl_cv_func_wmemchr=yes],
+       [gl_cv_func_wmemchr=no])
+    ])
+  if test $gl_cv_func_wmemchr = no; then
     HAVE_WMEMCHR=0
-    AC_LIBOBJ([wmemchr])
   fi
 ])