X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fwmemcpy.m4;h=bd35770e6bc5a3aa0c3af238ab372a590cebc68d;hb=6a0fd2e2d7d6a7e787ada21ffbe5f8ac0e3a06f1;hp=60af038efd8dbf514a3d7a4bb8ec8bb8ae6acb77;hpb=4b6dad7e35019625bd5eb30796beebac099a7422;p=gnulib.git

diff --git a/m4/wmemcpy.m4 b/m4/wmemcpy.m4
index 60af038ef..bd35770e6 100644
--- a/m4/wmemcpy.m4
+++ b/m4/wmemcpy.m4
@@ -1,5 +1,5 @@
-# wmemcpy.m4 serial 1
-dnl Copyright (C) 2011 Free Software Foundation, Inc.
+# wmemcpy.m4 serial 3
+dnl Copyright (C) 2011-2014 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_WMEMCPY],
 [
   AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
-  AC_CHECK_FUNCS_ONCE([wmemcpy])
-  if test $ac_cv_func_wmemcpy = 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 wmemcpy], [gl_cv_func_wmemcpy],
+    [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 ! wmemcpy ((wchar_t *) 0, (const wchar_t *) 0, 0);]])
+       ],
+       [gl_cv_func_wmemcpy=yes],
+       [gl_cv_func_wmemcpy=no])
+    ])
+  if test $gl_cv_func_wmemcpy = no; then
     HAVE_WMEMCPY=0
-    AC_LIBOBJ([wmemcpy])
   fi
 ])