summaryrefslogtreecommitdiffstats
path: root/win/tcl.m4
diff options
context:
space:
mode:
authorhobbs <hobbs>2006-03-28 21:17:25 (GMT)
committerhobbs <hobbs>2006-03-28 21:17:25 (GMT)
commit22435d0d61f83716a09d09e0e75003a5e21b87cd (patch)
treedd418a82d6d207e7927122f627f4ab9fec033a20 /win/tcl.m4
parenteb472aefb989640dc300fe2bc7d5228296a4ac4b (diff)
downloadtk-22435d0d61f83716a09d09e0e75003a5e21b87cd.zip
tk-22435d0d61f83716a09d09e0e75003a5e21b87cd.tar.gz
tk-22435d0d61f83716a09d09e0e75003a5e21b87cd.tar.bz2
* win/configure, win/tcl.m4: define MACHINE for gcc builds as well.
Needed by Tk for manifest generation.
Diffstat (limited to 'win/tcl.m4')
-rw-r--r--win/tcl.m47
1 files changed, 4 insertions, 3 deletions
diff --git a/win/tcl.m4 b/win/tcl.m4
index 975ac18..3e8d5c8 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -392,6 +392,10 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
SHLIB_SUFFIX=".dll"
+ # MACHINE is IX86 for LINK, but this is used by the manifest,
+ # which requires x86|amd64|ia64.
+ MACHINE="X86"
+
# Check for a bug in gcc's windres that causes the
# compile to fail when a Windows native path is
# passed into windres. The mingw toolchain requires
@@ -568,9 +572,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
# This is a 2-stage check to make sure we have the 64-bit SDK
# We have to know where the SDK is installed.
# This magic is based on MS Platform SDK for Win2003 SP1 - hobbs
- # MACHINE is IX86 for LINK, but this is used by the manifest,
- # which requires x86|amd64|ia64.
- MACHINE="X86"
if test "$do64bit" != "no" ; then
if test "x${MSSDK}x" = "xx" ; then
MSSDK="C:/Progra~1/Microsoft Platform SDK"