ENABLE_NLS now, not HAVE_NLS.

diff --git a/src/ChangeLog b/src/ChangeLog
index 000b68ab357c1bbb6e424dddc32d3ef1f0f17335..3c17e342cb5aa9a2a0ee4c2a477d646d4fb72cd2 100644 (file)
--- 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 43cb344d43e203390d0480bffa8b0a7a7ed41d17..8df7a36124b6b9f07cb3babcead8af160d58d136 100644 (file)
--- 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 */
 }
 \f
 /* Definition of command-line options. */