X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrpbrk.m4;h=fb5db91b7e7ee2d7cc2109c410079c37647cf98f;hb=ff4e8f6b53d7b8c53856ba8ba2adaad3251e6a88;hp=01425c4960d4363203d48659073c23efbffd6d01;hpb=57a1c06115f3e74f70b18301b66b15ad34ecafcf;p=gnulib.git

diff --git a/m4/strpbrk.m4 b/m4/strpbrk.m4
index 01425c496..fb5db91b7 100644
--- a/m4/strpbrk.m4
+++ b/m4/strpbrk.m4
@@ -1,15 +1,15 @@
-# strpbrk.m4 serial 2
-dnl Copyright (C) 2002-2003 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 5
+dnl Copyright (C) 2002-2003, 2007, 2009 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_REPLACE_FUNCS([strpbrk])
   if test $ac_cv_func_strpbrk = no; then
+    HAVE_STRPBRK=0
     gl_PREREQ_STRPBRK
   fi
 ])