From: Bruno Haible <bruno@clisp.org>
Date: Sun, 22 May 2011 11:10:05 +0000 (+0200)
Subject: strcspn: Move AC_LIBOBJ invocations to module description.
X-Git-Tag: v0.1~2423
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=99c35c81bd0be9f576c3b2438370f7f31dc65091;p=gnulib.git

strcspn: Move AC_LIBOBJ invocations to module description.

* m4/strcspn.m4 (gl_FUNC_STRCSPN): Call AC_CHECK_FUNCS instead of
AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STRCSPN invocations from
here...
* modules/strcspn (configure.ac): ... to here.
---

diff --git a/ChangeLog b/ChangeLog
index 8d781339a..ac5b09a76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
+	strcspn: Move AC_LIBOBJ invocations to module description.
+	* m4/strcspn.m4 (gl_FUNC_STRCSPN): Call AC_CHECK_FUNCS instead of
+	AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STRCSPN invocations from
+	here...
+	* modules/strcspn (configure.ac): ... to here.
+
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
 	strchrnul: Move AC_LIBOBJ invocations to module description.
 	* m4/strchrnul.m4 (gl_FUNC_STRCHRNUL): Move AC_LIBOBJ and
 	gl_PREREQ_STRCHRNUL invocations from here...
diff --git a/m4/strcspn.m4 b/m4/strcspn.m4
index df7a9554f..5c1c4d458 100644
--- a/m4/strcspn.m4
+++ b/m4/strcspn.m4
@@ -1,4 +1,4 @@
-# strcspn.m4 serial 3
+# strcspn.m4 serial 4
 dnl Copyright (C) 2002-2003, 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,
@@ -6,10 +6,7 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRCSPN],
 [
-  AC_REPLACE_FUNCS([strcspn])
-  if test $ac_cv_func_strcspn = no; then
-    gl_PREREQ_STRCSPN
-  fi
+  AC_CHECK_FUNCS([strcspn])
 ])
 
 # Prerequisites of lib/strcspn.c.
diff --git a/modules/strcspn b/modules/strcspn
index 5d2be9241..f2788bbab 100644
--- a/modules/strcspn
+++ b/modules/strcspn
@@ -15,6 +15,10 @@ Depends-on:
 
 configure.ac:
 gl_FUNC_STRCSPN
+if test $ac_cv_func_strcspn = no; then
+  AC_LIBOBJ([strcspn])
+  gl_PREREQ_STRCSPN
+fi
 
 Makefile.am: