memrchr: Move AC_LIBOBJ invocations to module description.

* m4/memrchr.m4 (gl_FUNC_MEMRCHR): Call AC_CHECK_FUNCS instead of
AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_MEMRCHR invocations from
here...
* modules/memrchr (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 9903eee5f39b9ca4fdd24dcdea3dfbb70968b242..889830905ccfb7e20bd0d00b271bf19a5a4e4f1e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
+       memrchr: Move AC_LIBOBJ invocations to module description.
+       * m4/memrchr.m4 (gl_FUNC_MEMRCHR): Call AC_CHECK_FUNCS instead of
+       AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_MEMRCHR invocations from
+       here...
+       * modules/memrchr (configure.ac): ... to here.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
        mempcpy: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/memrchr.m4 b/m4/memrchr.m4
index 90a89440a2915eadd613f4cbd642a1e2215be7d2..30d6182877cb5b97607688094c038f153e8f83fc 100644 (file)
--- a/m4/memrchr.m4
+++ b/m4/memrchr.m4
@@ -1,4 +1,4 @@
-# memrchr.m4 serial 9
+# memrchr.m4 serial 10
 dnl Copyright (C) 2002-2003, 2005-2007, 2009-2011 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -16,10 +16,7 @@ AC_DEFUN([gl_FUNC_MEMRCHR],
     HAVE_DECL_MEMRCHR=0
   fi
 
-  AC_REPLACE_FUNCS([memrchr])
-  if test $ac_cv_func_memrchr = no; then
-    gl_PREREQ_MEMRCHR
-  fi
+  AC_CHECK_FUNCS([memrchr])
 ])
 
 # Prerequisites of lib/memrchr.c.

diff --git a/modules/memrchr b/modules/memrchr
index 3a6e982b68bc5344265096f1064c59eea2577997..62f7c34484941d0f5daffdecf93324bc6c0200f4 100644 (file)
--- a/modules/memrchr
+++ b/modules/memrchr
@@ -11,6 +11,10 @@ string
 
 configure.ac:
 gl_FUNC_MEMRCHR
+if test $ac_cv_func_memrchr = no; then
+  AC_LIBOBJ([memrchr])
+  gl_PREREQ_MEMRCHR
+fi
 gl_STRING_MODULE_INDICATOR([memrchr])
 
 Makefile.am: