X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrpbrk.m4;h=2d2f04126db36367138653a1ab64518b95b12dbd;hb=662aa36b38af69284da00e33d6a8f4fa6d19e79e;hp=68360684eeef77885ea6f7bc9bff63d954beb8ee;hpb=52aceb00a8ce321a73680b2d5890de75be23f29f;p=gnulib.git

diff --git a/m4/strpbrk.m4 b/m4/strpbrk.m4
index 68360684e..2d2f04126 100644
--- a/m4/strpbrk.m4
+++ b/m4/strpbrk.m4
@@ -1,13 +1,15 @@
-# strpbrk.m4 serial 2
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+# strpbrk.m4 serial 5
+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,
 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
 ])