X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmempcpy.m4;h=12df771e4c9937a3197eb151faffe30e98d9ffcb;hb=7ba06c8ff37d8725cb824c64b94be41b9294ffb7;hp=a96168d88e527570bcd760b166e9f6f10295a215;hpb=fad1a126549040a4709fa637a264bce6b1262f9d;p=gnulib.git

diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4
index a96168d88..12df771e4 100644
--- a/m4/mempcpy.m4
+++ b/m4/mempcpy.m4
@@ -1,18 +1,22 @@
-# mempcpy.m4 serial 3
-dnl Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# mempcpy.m4 serial 10
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2010 Free Software Foundation,
+dnl 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.
 
 AC_DEFUN([gl_FUNC_MEMPCPY],
 [
-  AC_LIBSOURCES([mempcpy.c, mempcpy.h])
-
   dnl Persuade glibc <string.h> to declare mempcpy().
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  dnl The mempcpy() declaration in lib/string.in.h uses 'restrict'.
+  AC_REQUIRE([AC_C_RESTRICT])
 
-  AC_REPLACE_FUNCS(mempcpy)
+  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
+  AC_REPLACE_FUNCS([mempcpy])
   if test $ac_cv_func_mempcpy = no; then
+    HAVE_MEMPCPY=0
     gl_PREREQ_MEMPCPY
   fi
 ])