diff options
| author | mdejong <mdejong> | 2001-06-23 02:05:05 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2001-06-23 02:05:05 (GMT) |
| commit | 0cd74165f6ff9c88b56ceb9fa36e735b63e53e92 (patch) | |
| tree | fb0bbdbea2ef3b35557320cebcebf7e2e8accea1 | |
| parent | 8e8f33e912a857a24726b8ce00c16008db376cc9 (diff) | |
| download | tcl-0cd74165f6ff9c88b56ceb9fa36e735b63e53e92.zip tcl-0cd74165f6ff9c88b56ceb9fa36e735b63e53e92.tar.gz tcl-0cd74165f6ff9c88b56ceb9fa36e735b63e53e92.tar.bz2 | |
* win/configure:
* win/configure.in: Add resource compiler fix from
8.3.3 to fix compiling with mingw.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | win/configure | 12 | ||||
| -rw-r--r-- | win/configure.in | 14 |
3 files changed, 25 insertions, 7 deletions
@@ -1,5 +1,11 @@ 2001-06-22 Mo DeJong <mdejong@redhat.com> + * win/configure: + * win/configure.in: Add resource compiler fix from + 8.3.3 to fix compiling with mingw. + +2001-06-22 Mo DeJong <mdejong@redhat.com> + * win/configure: Regen. * win/tcl.m4: Fix silly typo in last checkin. diff --git a/win/configure b/win/configure index 3f84afa..1c8d0d3 100755 --- a/win/configure +++ b/win/configure @@ -1490,15 +1490,21 @@ CFG_TCL_EXPORT_FILE_SUFFIX=${TCL_EXPORT_FILE_SUFFIX} # on symbols and static vs. shared. #-------------------------------------------------------------------- +if test "${GCC}" = "yes" ; then + RC_DEFINE_FLAG=--define +else + RC_DEFINE_FLAG=-d +fi + if test ${SHARED_BUILD} = 0 ; then if test "${DBGX}" = "d"; then - RC_DEFINES="-d STATIC_BUILD -d DEBUG" + RC_DEFINES="${RC_DEFINE_FLAG} STATIC_BUILD ${RC_DEFINE_FLAG} DEBUG" else - RC_DEFINES="-d STATIC_BUILD" + RC_DEFINES="${RC_DEFINE_FLAG} STATIC_BUILD" fi else if test "${DBGX}" = "d"; then - RC_DEFINES="-d DEBUG" + RC_DEFINES="${RC_DEFINE_FLAG} DEBUG" else RC_DEFINES="" fi diff --git a/win/configure.in b/win/configure.in index fddccc9..7b7cb53 100644 --- a/win/configure.in +++ b/win/configure.in @@ -2,7 +2,7 @@ # generate the file "configure", which is run during Tcl installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.32 2001/06/22 23:02:53 mdejong Exp $ +# RCS: @(#) $Id: configure.in,v 1.33 2001/06/23 02:05:05 mdejong Exp $ AC_INIT(../generic/tcl.h) @@ -143,15 +143,21 @@ CFG_TCL_EXPORT_FILE_SUFFIX=${TCL_EXPORT_FILE_SUFFIX} # on symbols and static vs. shared. #-------------------------------------------------------------------- +if test "${GCC}" = "yes" ; then + RC_DEFINE_FLAG=--define +else + RC_DEFINE_FLAG=-d +fi + if test ${SHARED_BUILD} = 0 ; then if test "${DBGX}" = "d"; then - RC_DEFINES="-d STATIC_BUILD -d DEBUG" + RC_DEFINES="${RC_DEFINE_FLAG} STATIC_BUILD ${RC_DEFINE_FLAG} DEBUG" else - RC_DEFINES="-d STATIC_BUILD" + RC_DEFINES="${RC_DEFINE_FLAG} STATIC_BUILD" fi else if test "${DBGX}" = "d"; then - RC_DEFINES="-d DEBUG" + RC_DEFINES="${RC_DEFINE_FLAG} DEBUG" else RC_DEFINES="" fi |