X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flocalcharset.m4;h=ee2e801bdd9a32ab89c007e1a128a174523cbe73;hb=c47e73f47733362996652ecbb683347920a183b6;hp=d163c4c1a00529b227a98a42a5e8a7cb9e3a9b4c;hpb=53b8fa05726a7fb30010e42ce02e44a35f0d7489;p=gnulib.git

diff --git a/m4/localcharset.m4 b/m4/localcharset.m4
index d163c4c1a..ee2e801bd 100644
--- a/m4/localcharset.m4
+++ b/m4/localcharset.m4
@@ -1,19 +1,17 @@
-# localcharset.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.
+# localcharset.m4 serial 7
+dnl Copyright (C) 2002, 2004, 2006, 2009, 2010 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_LOCALCHARSET],
 [
   dnl Prerequisites of lib/localcharset.c.
-  AC_CHECK_HEADERS_ONCE(stddef.h stdlib.h string.h)
   AC_REQUIRE([AM_LANGINFO_CODESET])
-  AC_CHECK_FUNCS_ONCE(setlocale)
+  AC_REQUIRE([gl_FCNTL_O_FLAGS])
+  AC_CHECK_DECLS_ONCE([getc_unlocked])
 
   dnl Prerequisites of the lib/Makefile.am snippet.
   AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([jm_GLIBC21])
+  AC_REQUIRE([gl_GLIBC21])
 ])