summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xwin/configure12
-rw-r--r--win/configure.in14
3 files changed, 25 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f7e7d3..3486589 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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