X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fstrpbrk.m4;h=3a5f4c34db0c102c9d2cd5ec5fc6841eddfd82b9;hb=e660a47d371278b8d4ba7f227c5df451984cfe5b;hp=1f5fa01b875cafc453e42fb7e71ea17806f092b8;hpb=53b8fa05726a7fb30010e42ce02e44a35f0d7489;p=gnulib.git

diff --git a/m4/strpbrk.m4 b/m4/strpbrk.m4
index 1f5fa01b8..3a5f4c34d 100644
--- a/m4/strpbrk.m4
+++ b/m4/strpbrk.m4
@@ -1,20 +1,17 @@
-# strpbrk.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# strpbrk.m4 serial 6
+dnl Copyright (C) 2002-2003, 2007, 2009-2012 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRPBRK],
 [
-  AC_REPLACE_FUNCS(strpbrk)
+  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
+  AC_CHECK_FUNCS([strpbrk])
   if test $ac_cv_func_strpbrk = no; then
-    gl_PREREQ_STRPBRK
+    HAVE_STRPBRK=0
   fi
 ])
 
 # Prerequisites of lib/strpbrk.c.
-AC_DEFUN([gl_PREREQ_STRPBRK], [
-  AC_CHECK_HEADERS_ONCE(string.h)
-])
+AC_DEFUN([gl_PREREQ_STRPBRK], [:])