From: Micah Cowan <micah@cowan.name>
Date: Thu, 11 Oct 2007 04:03:07 +0000 (-0700)
Subject: Merged with eleven for Gisle's mswindows.c patch.
X-Git-Tag: v1.13~516
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=61533a5ebcb778a2a0b574b862ea8a10395c053d

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

61533a5ebcb778a2a0b574b862ea8a10395c053d
diff --cc src/ChangeLog
index 6d1733fd,ee370c36..76558534
--- a/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