From: Micah Cowan <micah@cowan.name>
Date: Wed, 3 Oct 2007 04:36:57 +0000 (-0700)
Subject: Merge with mainline
X-Git-Tag: v1.13~532
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=c2c71c32cf7e75336bb45fc299658910e0f9f8af;hp=5f341d6bc175e2cb046680587eaa281791b91ceb

Merge with mainline
---

diff --git a/ChangeLog b/ChangeLog
index d4023950..1832ba82 100644
--- 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 703ee482..1e8fadfe 100644
--- 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 06d4103e..d9223c5f 100644
--- 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 9424a690..24bc1cba 100644
--- 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 b80fa17d..8c059c0f 100644
--- 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 1dc0f7fb..920186ce 100644
--- 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