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.

diff --git a/ChangeLog b/ChangeLog
index 4b21cf3c3e3b3f9ad2c03809deeb38793435331b..50275a216c08ba84b6373d57cde29e0a6f361714 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.

diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4
index a8d0f10f251a425bea1a59a2d3c9341fbeb97eaa..2953f51f4293a2d9a566cd014535c217bc6770b2 100644 (file)
--- 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_DEFUN([gl_FUNC_RPMATCH],
   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
 ])
 

diff --git a/modules/rpmatch b/modules/rpmatch
index bfa5380da1c5f85b8d126f97a2b513f3e3b37a99..f64286b415d050e24890102eb28a2c08e1e0ccde 100644 (file)
--- a/modules/rpmatch
+++ b/modules/rpmatch
@@ -15,6 +15,10 @@ strdup          [test $HAVE_RPMATCH = 0]
 
 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: