X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmempcpy.m4;h=7214a4b39ab0c09ccd6a45610ca986a74f6e7795;hb=251c566a3b21bb5700c7625c71d170b4b405172a;hp=e2b39d0826f64220056746b54c6a374fb532c91c;hpb=d4d9ba3c78eceac6e5f6755abe28f15cfece96e2;p=gnulib.git

diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4
index e2b39d082..7214a4b39 100644
--- a/m4/mempcpy.m4
+++ b/m4/mempcpy.m4
@@ -1,5 +1,6 @@
-# mempcpy.m4 serial 6
-dnl Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+# mempcpy.m4 serial 11
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2011 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.
@@ -7,13 +8,15 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_MEMPCPY],
 [
   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_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-  AC_REPLACE_FUNCS(mempcpy)
+  AC_CHECK_FUNCS([mempcpy])
   if test $ac_cv_func_mempcpy = no; then
     HAVE_MEMPCPY=0
-    gl_PREREQ_MEMPCPY
   fi
 ])