--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+	rpmatch: Move AC_LIBOBJ invocations to module description.
+	* m4/rpmatch.m4 (gl_FUNC_RPMATCH): Call AC_CHECK_FUNCS instead of
+	AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_RPMATCH invocations from
+	here...
+	* modules/rpmatch (configure.ac): ... to here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
 	rmdir: Respect rules for use of AC_LIBOBJ.
 	* m4/rmdir.m4 (gl_FUNC_RMDIR): Move AC_LIBOBJ invocation from here...
 	* modules/rmdir (configure.ac): ... to here.

--- a/m4/rpmatch.m4
+++ b/m4/rpmatch.m4
@@ -1,4 +1,4 @@
-# rpmatch.m4 serial 9
+# rpmatch.m4 serial 10
 dnl Copyright (C) 2002-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_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_REPLACE_FUNCS([rpmatch])
+  AC_CHECK_FUNCS([rpmatch])
   if test $ac_cv_func_rpmatch = no; then
     HAVE_RPMATCH=0
-    gl_PREREQ_RPMATCH
   fi
 ])
 

--- a/modules/rpmatch
+++ b/modules/rpmatch
@@ -15,6 +15,10 @@
 
 configure.ac:
 gl_FUNC_RPMATCH
+if test $HAVE_RPMATCH = 0; then
+  AC_LIBOBJ([rpmatch])
+  gl_PREREQ_RPMATCH
+fi
 gl_STDLIB_MODULE_INDICATOR([rpmatch])
 
 Makefile.am: