X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrchrnul.m4;h=7c1273aa8c123a1e9faca67ade5767d8d74ad6b4;hb=8eaac7a51d093dbcecc0c2b42a5762a882b4517b;hp=51edfb302856e5ce0d7b1a4f9bd0856a626a5afe;hpb=6545de6ca88cf3ef985d38cbb10d022c63b24dbe;p=gnulib.git

diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4
index 51edfb302..7c1273aa8 100644
--- a/m4/strchrnul.m4
+++ b/m4/strchrnul.m4
@@ -1,18 +1,18 @@
-# strchrnul.m4 serial 2
-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 6
+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([AC_USE_SYSTEM_EXTENSIONS])
 
+  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
 ])