Merged with eleven for Gisle's mswindows.c patch.

diff --combined src/ChangeLog
index 6d1733fde990f38115ac0121248365acea796c4a,ee370c365230d3ea97f679175ab4627b269c870e..765585344f105bf72df6feb2bacc8cd392347c5e
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,14 +1,19 @@@
 +2007-10-09  Gisle Vanem  <gvanem@broadpark.no>
 +
 +      * mswindows.c: 'argc' and 'argv' in 'windows_main()' are no longer
 +      needed.  Hence simply the prototype. Free 'exec_name' at exit.
 +
+ 2007-10-09  Micah Cowan  <micah@cowan.name>
+ 
+       * gettext.h: Imported from /usr/share/gettext, fuller handling
+       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.
+       * Makefile.am: added @LIBINTL@ to LIBS (though it probably
+       belongs in LDADD, along with everything else currently assigned
+       to LIBS).
+ 
  2007-10-08  Micah Cowan  <micah@cowan.name>
  
        * http.c (http_loop): Add send_head_first conditional back
@@@ -16,6 -22,8 +27,8 @@@
        * http.c (http_loop): We've got_name if content_disposition
        support isn't on; make sure we continue properly in that case,
        even though we're not sending HEAD.
+       * Makefile.in: Removed, replaced by Makefile.am.
+       * Makefile.am: Converted from Makefile.in.
  
  2007-10-02  Gisle Vanem  <gvanem@broadpark.no>
        

diff --combined src/main.c
index f60d0c0a940b0a3f0bc4a3392d8d9cc7c17a269e,8df7a36124b6b9f07cb3babcead8af160d58d136..42389839181433fb1cacbaacf644509c972ae436
--- 1/src/main.c
--- 2/src/main.c
+++ b/src/main.c
@@@ -36,7 -36,7 +36,7 @@@ so, delete this exception statement fro
  #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 +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. */
@@@ -708,7 -708,7 +708,7 @@@ main (int argc, char *const *argv
  
  #ifdef WINDOWS
    /* Drop extension (typically .EXE) from executable filename. */
 -  windows_main (&argc, (char **) argv, (char **) &exec_name);
 +  windows_main ((char **) &exec_name);
  #endif
  
    /* Set option defaults; read the system wgetrc and ~/.wgetrc.  */