From 174343c019f059265abe2338d411aee417f574a0 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 17:53:55 +0200
Subject: [PATCH] rawmemchr: Move AC_LIBOBJ invocations to module description.

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

diff --git a/ChangeLog b/ChangeLog
index e634d4854e..dd102d4d37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
+	rawmemchr: Move AC_LIBOBJ invocations to module description.
+	* m4/rawmemchr.m4 (gl_FUNC_RAWMEMCHR): Call AC_CHECK_FUNCS instead of
+	AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_RAWMEMCHR invocations
+	from here...
+	* modules/rawmemchr (configure.ac): ... to here.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
 	random_r: Move AC_LIBOBJ invocations to module description.
diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4
index 542cba18d5..3f136a67db 100644
--- a/m4/rawmemchr.m4
+++ b/m4/rawmemchr.m4
@@ -1,4 +1,4 @@
-# rawmemchr.m4 serial 1
+# rawmemchr.m4 serial 2
 dnl Copyright (C) 2003, 2007-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,
@@ -10,10 +10,9 @@ AC_DEFUN([gl_FUNC_RAWMEMCHR],
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-  AC_REPLACE_FUNCS([rawmemchr])
+  AC_CHECK_FUNCS([rawmemchr])
   if test $ac_cv_func_rawmemchr = no; then
     HAVE_RAWMEMCHR=0
-    gl_PREREQ_RAWMEMCHR
   fi
 ])
 
diff --git a/modules/rawmemchr b/modules/rawmemchr
index c9fd32392f..32320568c7 100644
--- a/modules/rawmemchr
+++ b/modules/rawmemchr
@@ -12,6 +12,10 @@ string
 
 configure.ac:
 gl_FUNC_RAWMEMCHR
+if test $HAVE_RAWMEMCHR = 0; then
+  AC_LIBOBJ([rawmemchr])
+  gl_PREREQ_RAWMEMCHR
+fi
 gl_STRING_MODULE_INDICATOR([rawmemchr])
 
 Makefile.am:
-- 
2.39.5