Merge with mainline

diff --git a/ChangeLog b/ChangeLog
index d402395070ca439e0b9a6f1c357fb3b4c5f2dfcd..1832ba82c765be3d34a6813e856f040f9ec41d8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-25  Micah Cowan  <micah@cowan.name>
+
+       * configure.in: Remove unnecessary heuristic to generate exeext
+       variable, since AC_PROG_CC and others automatically set EXEEXT.
+       Pointed out by Steve Kenton <skenton@ou.edu>.
+
 2007-09-12  Micah Cowan  <micah@cowan.name>
 
        * AUTHORS: Added... me...

diff --git a/configure.in b/configure.in
index 703ee482e925e749707f0594155f504de3ac7ac2..1e8fadfef66499cd096e1e0f3fd4d2b414f3a303 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -133,16 +133,6 @@ if test -n "$auto_cflags"; then
   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 --git a/src/ChangeLog b/src/ChangeLog
index 06d4103e372b3d8c1710e707ba164388f3863d97..d9223c5f02c310ac80ed2f2d1df14acf11b80251 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,10 @@
        (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,

diff --git a/src/Makefile.in b/src/Makefile.in
index 9424a690b1dd50262b1b97dd6689036f284818ea..24bc1cba3394df5db97d388ce89fcb5c7387260c 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -53,7 +53,7 @@ DEFS     = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(local
 CFLAGS   = @CFLAGS@
 LDFLAGS  = @LDFLAGS@ 
 LIBS     = @LIBS@ @LIBSSL@ @LIBGNUTLS@
-exeext   = @exeext@
+exeext   = @EXEEXT@
 
 INCLUDES = -I. -I$(srcdir)
 

diff --git a/tests/ChangeLog b/tests/ChangeLog
index b80fa17dcd4d4bc8899093a1bfe9069782d80887..8c059c0f982287b9183c95b089e3c4991f387296 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-25  Micah Cowan  <micah@cowan.name>
+
+       * Makefile.in: Use EXEEXT instead of exeext.
+
 2007-08-21  Mauro Tortonesi  <mauro@ferrara.linux.it>
 
        * WgetTest.pm.in: Added support for timestamping of pre-existing

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1dc0f7fbfc73e0f2381fd45d006c0e228108035e..920186cec4c91eef4de0eb57ce9fc0c80b9ff863 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -53,7 +53,7 @@ DEFS     = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(local
 CFLAGS   = @CFLAGS@
 LDFLAGS  = @LDFLAGS@ 
 LIBS     = @LIBS@ @LIBSSL@ @LIBGNUTLS@
-exeext   = @exeext@
+exeext   = @EXEEXT@
 
 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../src