From 828b890695a732a5cb32856b77e9906fac231a02 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 15:23:42 +0200
Subject: [PATCH] mempcpy: Move AC_LIBOBJ invocations to module description.

* m4/mempcpy.m4 (gl_FUNC_MEMPCPY): Call AC_CHECK_FUNCS instead of
AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_MEMPCPY invocations from
here...
* modules/mempcpy (configure.ac): ... to here.
---
 ChangeLog       | 8 ++++++++
 m4/mempcpy.m4   | 5 ++---
 modules/mempcpy | 4 ++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 756b75355..9903eee5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+	mempcpy: Move AC_LIBOBJ invocations to module description.
+	* m4/mempcpy.m4 (gl_FUNC_MEMPCPY): Call AC_CHECK_FUNCS instead of
+	AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_MEMPCPY invocations from
+	here...
+	* modules/mempcpy (configure.ac): ... to here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
 	memmove: Move AC_LIBOBJ invocations to module description.
 	* m4/memmove.m4 (gl_FUNC_MEMMOVE): Call AC_CHECK_FUNCS instead of
 	AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_MEMMOVE invocations from
diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4
index cc36900a1..7214a4b39 100644
--- a/m4/mempcpy.m4
+++ b/m4/mempcpy.m4
@@ -1,4 +1,4 @@
-# mempcpy.m4 serial 10
+# 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
@@ -14,10 +14,9 @@ AC_DEFUN([gl_FUNC_MEMPCPY],
   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
 ])
 
diff --git a/modules/mempcpy b/modules/mempcpy
index 5fd8bdce8..9af465493 100644
--- a/modules/mempcpy
+++ b/modules/mempcpy
@@ -11,6 +11,10 @@ string
 
 configure.ac:
 gl_FUNC_MEMPCPY
+if test $HAVE_MEMPCPY = 0; then
+  AC_LIBOBJ([mempcpy])
+  gl_PREREQ_MEMPCPY
+fi
 gl_STRING_MODULE_INDICATOR([mempcpy])
 
 Makefile.am:
-- 
2.11.0