Merge with mainline

diff --combined configure.in
index 703ee482e925e749707f0594155f504de3ac7ac2,6c6e8c0ff74db08994bbc32c9d13eb5fc00e9f43..1e8fadfef66499cd096e1e0f3fd4d2b414f3a303
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1,5 -1,5 +1,5 @@@
  dnl Template file for GNU Autoconf
 -dnl Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
 +dnl Copyright (C) 1995, 1996, 1997, 2001, 2007 Free Software Foundation, Inc.
  
  dnl This program is free software; you can redistribute it and/or modify
  dnl it under the terms of the GNU General Public License as published by
@@@ -133,16 -133,6 +133,6 @@@ if test -n "$auto_cflags"; the
    fi
  fi
  
- dnl
- dnl In case of {cyg,gnu}win32.  Should be a _target_ test.
- dnl Might also be erelevant for DJGPP.
- dnl
- case "$host_os" in
-   *win32) exeext='.exe';;
-   *) exeext='';;
- esac
- AC_SUBST(exeext)
- 
  dnl
  dnl Checks for basic compiler characteristics.
  dnl

diff --combined src/ChangeLog
index 06d4103e372b3d8c1710e707ba164388f3863d97,f3e930a7162358fcfb63ae044464c7943e2df416..d9223c5f02c310ac80ed2f2d1df14acf11b80251
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,14 -1,7 +1,18 @@@
 +2007-10-02  Micah Cowan  <micah@cowan.name>
 +
 +      * ftp.c (getftp, ftp_loop_internal), http.c (http_loop), main
 +      (main): Use datetime_str instead of time_str, for those who have
 +      potentially long-running sessions.
 +
+ 2007-09-25  Micah Cowan  <micah@cowan.name>
+ 
+       * Makefile.in: Use EXEEXT instead of exeext.
+ 
 +2007-09-24  Gisle Vanem  <giva@bgnett.no>
 +
 +      * connect.c, init.c, main.c, openssl.c, options.h, sysdep.h,
 +      url.c, utils.c: Added support for building on MS-DOS.
 +
  2007-09-24  Jochen Roderburg  <roderburg@uni-koeln.de>
  
        * http.c (http_zero): Remove no-longer-used local_size variable.

diff --combined src/Makefile.in
index 9424a690b1dd50262b1b97dd6689036f284818ea,34bc3bdb97376031f5d715f7115acc6843951539..24bc1cba3394df5db97d388ce89fcb5c7387260c
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -1,6 -1,5 +1,6 @@@
  # Makefile for `wget' utility
 -# Copyright (C) 1995-2006 Free Software Foundation, Inc.
 +# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
 +# 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
@@@ -53,7 -52,7 +53,7 @@@ DEFS     = @DEFS@ -DSYSTEM_WGETRC=\"$(s
  CFLAGS   = @CFLAGS@
  LDFLAGS  = @LDFLAGS@ 
  LIBS     = @LIBS@ @LIBSSL@ @LIBGNUTLS@
- exeext   = @exeext@
+ exeext   = @EXEEXT@
  
  INCLUDES = -I. -I$(srcdir)
  

diff --combined tests/Makefile.in
index 1dc0f7fbfc73e0f2381fd45d006c0e228108035e,64a9dc38d1aca0231a1219b46f517e883e27ef3f..920186cec4c91eef4de0eb57ce9fc0c80b9ff863
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -1,6 -1,5 +1,6 @@@
  # Makefile for `wget' utility
 -# Copyright (C) 1995-2005 Free Software Foundation, Inc.
 +# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
 +# 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
@@@ -53,7 -52,7 +53,7 @@@ DEFS     = @DEFS@ -DSYSTEM_WGETRC=\"$(s
  CFLAGS   = @CFLAGS@
  LDFLAGS  = @LDFLAGS@ 
  LIBS     = @LIBS@ @LIBSSL@ @LIBGNUTLS@
- exeext   = @exeext@
+ exeext   = @EXEEXT@
  
  INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../src