summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xwin/configure14
-rw-r--r--win/configure.in16
3 files changed, 27 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index db2e664..330a4b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
2001-06-22 Mo DeJong <mdejong@redhat.com>
* win/configure: Regen.
+ * 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.
2001-06-22 Mo DeJong <mdejong@redhat.com>
diff --git a/win/configure b/win/configure
index 9599c9a..1ac97d1 100755
--- a/win/configure
+++ b/win/configure
@@ -1587,20 +1587,26 @@ CFG_TK_EXPORT_FILE_SUFFIX=${TK_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 -o $TCL_NEEDS_EXP_FILE = 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
TK_RES=""
else
if test "${DBGX}" = "d"; then
- RC_DEFINES="-d DEBUG"
+ RC_DEFINES="${RC_DEFINE_FLAG} DEBUG"
else
RC_DEFINES=""
fi
- TK_RES=tk.res
+ TK_RES='tk.$(RES)'
fi
diff --git a/win/configure.in b/win/configure.in
index 1c867fb..1dc0d76 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -2,7 +2,7 @@
# generate the file "configure", which is run during Tk installation
# to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.27 2001/06/22 23:59:48 mdejong Exp $
+# RCS: @(#) $Id: configure.in,v 1.28 2001/06/23 02:10:28 mdejong Exp $
AC_INIT(../generic/tk.h)
@@ -159,20 +159,26 @@ CFG_TK_EXPORT_FILE_SUFFIX=${TK_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 -o $TCL_NEEDS_EXP_FILE = 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
TK_RES=""
else
if test "${DBGX}" = "d"; then
- RC_DEFINES="-d DEBUG"
+ RC_DEFINES="${RC_DEFINE_FLAG} DEBUG"
else
RC_DEFINES=""
fi
- TK_RES=tk.res
+ TK_RES='tk.$(RES)'
fi
AC_SUBST(TK_VERSION)