From a33fa2dbe0c66971f12334ccaef724140adca072 Mon Sep 17 00:00:00 2001
From: Micah Cowan <micah@cowan.name>
Date: Tue, 9 Oct 2007 13:30:04 -0700
Subject: [PATCH] ENABLE_NLS now, not HAVE_NLS.
---
src/ChangeLog | 1 +
src/main.c | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index 000b68ab..3c17e342 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,7 @@
of --disable-nls.
* wget.h: Remove logic for handling lack of NLS (now in
gettext.h).
+ * main.c: Use gettext's ENABLE_NLS rather than HAVE_NLS.
2007-10-08 Micah Cowan <micah@cowan.name>
diff --git a/src/main.c b/src/main.c
index 43cb344d..8df7a361 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>
-#ifdef HAVE_NLS
+#ifdef ENABLE_NLS
# include <locale.h>
#endif
#include <assert.h>
@@ -80,14 +80,14 @@ const char *exec_name;
static void
i18n_initialize (void)
{
- /* HAVE_NLS implies existence of functions invoked here. */
-#ifdef HAVE_NLS
+ /* ENABLE_NLS implies existence of functions invoked here. */
+#ifdef ENABLE_NLS
/* Set the current locale. */
setlocale (LC_ALL, "");
/* Set the text message domain. */
bindtextdomain ("wget", LOCALEDIR);
textdomain ("wget");
-#endif /* HAVE_NLS */
+#endif /* ENABLE_NLS */
}
/* Definition of command-line options. */