strpbrk: Move AC_LIBOBJ invocations to module description.

* m4/strpbrk.m4 (gl_FUNC_STRPBRK): Call AC_CHECK_FUNCS instead of
AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STRPBRK invocations from
here...
* modules/strpbrk (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index d2bf73df0932b9a5264106ed4c329cd1d24299ed..5ab6346b768dab8865e02be6e7e1d4e5b65bbb90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+       strpbrk: Move AC_LIBOBJ invocations to module description.
+       * m4/strpbrk.m4 (gl_FUNC_STRPBRK): Call AC_CHECK_FUNCS instead of
+       AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STRPBRK invocations from
+       here...
+       * modules/strpbrk (configure.ac): ... to here.
+
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
        strnlen: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/strpbrk.m4 b/m4/strpbrk.m4
index 2d2f04126db36367138653a1ab64518b95b12dbd..40537ca8878a8d1a29939da77b4104dc2a312e95 100644 (file)
--- a/m4/strpbrk.m4
+++ b/m4/strpbrk.m4
@@ -1,4 +1,4 @@
-# strpbrk.m4 serial 5
+# strpbrk.m4 serial 6
 dnl Copyright (C) 2002-2003, 2007, 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,
@@ -7,10 +7,9 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_STRPBRK],
 [
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-  AC_REPLACE_FUNCS([strpbrk])
+  AC_CHECK_FUNCS([strpbrk])
   if test $ac_cv_func_strpbrk = no; then
     HAVE_STRPBRK=0
-    gl_PREREQ_STRPBRK
   fi
 ])
 

diff --git a/modules/strpbrk b/modules/strpbrk
index f0f1a858a9abc8e687369e0e4565b86b57a4230d..3433e57cbd7543df7d25a395da4673b0ccb4c2f5 100644 (file)
--- a/modules/strpbrk
+++ b/modules/strpbrk
@@ -16,6 +16,10 @@ string
 
 configure.ac:
 gl_FUNC_STRPBRK
+if test $HAVE_STRPBRK = 0; then
+  AC_LIBOBJ([strpbrk])
+  gl_PREREQ_STRPBRK
+fi
 gl_STRING_MODULE_INDICATOR([strpbrk])
 
 Makefile.am: