No need any more to check for setlocale - all systems have it.

diff --git a/ChangeLog b/ChangeLog
index e0a6873abb4593ed34a69679860d6ae8b928547e..b4da51bc1d27a6df2de99c3f95d7697678cd83a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/localcharset.c: Do not check HAVE_SETLOCALE.
+       * m4/localcharset.m4 (gl_LOCALCHARSET): Don't check for setlocale.
+
 2006-10-17  Eric Blake  <ebb9@byu.net>
 
        * lib/sigprocmask.c (sigprocmask): Fix typo.

diff --git a/lib/localcharset.c b/lib/localcharset.c
index a2fc5dc55348b04e8aad45b1cec3dd1abb6230ba..a0f7cca691879bbd6b4f14f7b2e58f11123d87a2 100644 (file)
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -41,7 +41,7 @@
 # if HAVE_LANGINFO_CODESET
 #  include <langinfo.h>
 # else
-#  if HAVE_SETLOCALE
+#  if 0 /* see comment below */
 #   include <locale.h>
 #  endif
 # endif
@@ -351,7 +351,7 @@ locale_charset (void)
      (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
      use setlocale here; it would return "C" when it doesn't support the
      locale name the user has set.  */
-#  if HAVE_SETLOCALE && 0
+#  if 0
   locale = setlocale (LC_CTYPE, NULL);
 #  endif
   if (locale == NULL || locale[0] == '\0')

diff --git a/m4/localcharset.m4 b/m4/localcharset.m4
index c0396356ceb7c96a9d7ad2a14117815d58eb7961..b2b77338e343b953fe10dbc5356b283f7333601f 100644 (file)
--- a/m4/localcharset.m4
+++ b/m4/localcharset.m4
@@ -1,4 +1,4 @@
-# localcharset.m4 serial 4
+# localcharset.m4 serial 5
 dnl Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,6 @@ AC_DEFUN([gl_LOCALCHARSET],
   dnl Prerequisites of lib/localcharset.c.
   AC_REQUIRE([AM_LANGINFO_CODESET])
   AC_CHECK_DECLS_ONCE(getc_unlocked)
-  AC_CHECK_FUNCS_ONCE(setlocale)
 
   dnl Prerequisites of the lib/Makefile.am snippet.
   AC_REQUIRE([AC_CANONICAL_HOST])