From 7b5d32ef8bff2910dba4c806a844f61ff41c94d0 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 22 May 2011 12:48:51 +0200
Subject: [PATCH] stpcpy: Move AC_LIBOBJ invocations to module description.

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

diff --git a/ChangeLog b/ChangeLog
index ad665e532..93b2ddf41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+	stpcpy: Move AC_LIBOBJ invocations to module description.
+	* m4/stpcpy.m4 (gl_FUNC_STPCPY): Call AC_CHECK_FUNCS instead of
+	AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STPCPY invocations from
+	here...
+	* modules/stpcpy (configure.ac): ... to here.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
 	stat: Move AC_LIBOBJ invocations to module description.
diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4
index c321d496b..778cc2890 100644
--- a/m4/stpcpy.m4
+++ b/m4/stpcpy.m4
@@ -1,4 +1,4 @@
-# stpcpy.m4 serial 7
+# stpcpy.m4 serial 8
 dnl Copyright (C) 2002, 2007, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13,10 +13,9 @@ AC_DEFUN([gl_FUNC_STPCPY],
   AC_REQUIRE([AC_C_RESTRICT])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-  AC_REPLACE_FUNCS([stpcpy])
+  AC_CHECK_FUNCS([stpcpy])
   if test $ac_cv_func_stpcpy = no; then
     HAVE_STPCPY=0
-    gl_PREREQ_STPCPY
   fi
 ])
 
diff --git a/modules/stpcpy b/modules/stpcpy
index 3d00faf40..2c3cc951e 100644
--- a/modules/stpcpy
+++ b/modules/stpcpy
@@ -11,6 +11,10 @@ string
 
 configure.ac:
 gl_FUNC_STPCPY
+if test $HAVE_STPCPY = 0; then
+  AC_LIBOBJ([stpcpy])
+  gl_PREREQ_STPCPY
+fi
 gl_STRING_MODULE_INDICATOR([stpcpy])
 
 Makefile.am:
-- 
2.11.0