diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | win/configure | 3 | ||||
| -rw-r--r-- | win/tcl.m4 | 3 |
3 files changed, 14 insertions, 0 deletions
@@ -1,3 +1,11 @@ +2005-12-09 Mo DeJong <mdejong@users.sourceforge.net> + + * win/configure: Regen. + * win/tcl.m4 (SC_CONFIG_CFLAGS): Define MACHINE + for gcc builds. The lack of a definition of this + variable in the manifest file was causing a + runtime error in wish built with gcc. + 2005-12-09 Donal K. Fellows <donal.k.fellows@manchester.ac.uk> * tests/lsearch.test (lsearch-10.8..10): If the -start is off the end, diff --git a/win/configure b/win/configure index 2391b54..eeb01c5 100755 --- a/win/configure +++ b/win/configure @@ -3417,6 +3417,9 @@ echo "$as_me: error: ${CC} does not support the -shared option. #LDFLAGS_WINDOW="-mwindows -e _WinMain@16 ${extra_ldflags}" LDFLAGS_CONSOLE="-mconsole ${extra_ldflags}" LDFLAGS_WINDOW="-mwindows ${extra_ldflags}" + + # gcc under Windows supports only 32bit builds + MACHINE="X86" else if test "${SHARED_BUILD}" = "0" ; then # static @@ -552,6 +552,9 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ #LDFLAGS_WINDOW="-mwindows -e _WinMain@16 ${extra_ldflags}" LDFLAGS_CONSOLE="-mconsole ${extra_ldflags}" LDFLAGS_WINDOW="-mwindows ${extra_ldflags}" + + # gcc under Windows supports only 32bit builds + MACHINE="X86" else if test "${SHARED_BUILD}" = "0" ; then # static |