From cf48fcc2bbe4a498b7c22fd827f0a00ada091f86 Mon Sep 17 00:00:00 2001
From: hniksic <devnull@localhost>
Date: Wed, 29 Jun 2005 14:45:44 -0700
Subject: [PATCH] [svn] Unconditionally include locale.h.

---
 ChangeLog     | 4 ++++
 m4/wget.m4    | 2 +-
 src/ChangeLog | 4 ++++
 src/main.c    | 2 +-
 src/utils.c   | 4 +---
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9dbae27c..aea73d91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-29  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* m4/wget.m4 (WGET_WITH_NLS): Don't check for locale.h.
+
 2005-06-29  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* configure.in: Test for $LIBSSL instead of the old $ssl_success
diff --git a/m4/wget.m4 b/m4/wget.m4
index c115de75..86ced408 100644
--- a/m4/wget.m4
+++ b/m4/wget.m4
@@ -279,7 +279,7 @@ AC_DEFUN([WGET_WITH_NLS],
 	fi
       fi
 
-      AC_CHECK_HEADERS(locale.h libintl.h)
+      AC_CHECK_HEADERS(libintl.h)
 
       dnl Prefer gettext found in -lintl to the one in libc.
       dnl Otherwise it can happen that we include libintl.h from
diff --git a/src/ChangeLog b/src/ChangeLog
index 7e1617c8..bbe364c6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-29  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* utils.c: Unconditionally include locale.h.
+
 2005-06-29  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* ptimer.c: Include sys/time.h to get struct timeval.
diff --git a/src/main.c b/src/main.c
index ecbd8808..d05292a7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -36,7 +36,7 @@ so, delete this exception statement from your version.  */
 #endif /* HAVE_UNISTD_H */
 #include <string.h>
 #include <signal.h>
-#if defined(HAVE_NLS) && defined(HAVE_LOCALE_H)
+#ifdef HAVE_NLS
 # include <locale.h>
 #endif
 #include <assert.h>
diff --git a/src/utils.c b/src/utils.c
index d785f1ba..a88d1290 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -58,9 +58,7 @@ so, delete this exception statement from your version.  */
 #include <fcntl.h>
 #include <assert.h>
 #include <stdarg.h>
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
+#include <locale.h>
 
 /* For TIOCGWINSZ and friends: */
 #ifdef HAVE_SYS_IOCTL_H
-- 
2.39.2