X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fstrchrnul.m4;h=fec2a10d96b1d954f0694c2d02cb1ef417a9c3b9;hb=f6183e64302b3af947cdd932049180b5a32f6443;hp=565e338d5cefbfbf704a1605f768275b9e3b07fd;hpb=2d0fc24aba5e2c71a55b991a6e0ba6a01110581f;p=gnulib.git

diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4
index 565e338d5..fec2a10d9 100644
--- a/m4/strchrnul.m4
+++ b/m4/strchrnul.m4
@@ -1,23 +1,21 @@
-# strchrnul.m4 serial 1
-dnl Copyright (C) 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.
+# strchrnul.m4 serial 5
+dnl Copyright (C) 2003, 2007 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_STRCHRNUL],
 [
   dnl Persuade glibc <string.h> to declare strchrnul().
   AC_REQUIRE([AC_GNU_SOURCE])
 
+  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
   AC_REPLACE_FUNCS(strchrnul)
   if test $ac_cv_func_strchrnul = no; then
+    HAVE_STRCHRNUL=0
     gl_PREREQ_STRCHRNUL
   fi
 ])
 
 # Prerequisites of lib/strchrnul.c.
-AC_DEFUN([gl_PREREQ_STRCHRNUL], [
-  AC_CHECK_HEADERS_ONCE(string.h)
-])
+AC_DEFUN([gl_PREREQ_STRCHRNUL], [:])