Mercurial > hg > octave-lyh > gnulib-hg

changeset 15108:ca5461c4906c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sun, 22 May 2011 13:39:57 +0200
parents b8f7f613454d
children 0d681ec553c1
files ChangeLog m4/strpbrk.m4 modules/strpbrk
diffstat 3 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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 @@
 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
 ])
 
--- a/modules/strpbrk
+++ b/modules/strpbrk
@@ -16,6 +16,10 @@
 
 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: