summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-05 16:27:53 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-05 16:27:53 (GMT)
commit24ea39ac53ca868aec6e2e78f48f4e60138884fe (patch)
tree65ecb3ddccea5ae2b02c8ddb56ac280b7adffdee /win
parent83dd76da7170a8bb9c59b60508c5df606204709c (diff)
parent302dfe1be6830add9d1bd8b57b4bc6c00fc609b3 (diff)
downloadtk-24ea39ac53ca868aec6e2e78f48f4e60138884fe.zip
tk-24ea39ac53ca868aec6e2e78f48f4e60138884fe.tar.gz
tk-24ea39ac53ca868aec6e2e78f48f4e60138884fe.tar.bz2
merge trunk
Diffstat (limited to 'win')
-rwxr-xr-xwin/configure7
-rw-r--r--win/tcl.m44
2 files changed, 0 insertions, 11 deletions
diff --git a/win/configure b/win/configure
index fc8f41c..ad99837 100755
--- a/win/configure
+++ b/win/configure
@@ -3379,9 +3379,6 @@ fi
if test "$GCC" = "yes"; then
- if test "$TCL_CC" = "gcc"; then
- CFLAGS="$CFLAGS -mwin32"
- fi
echo "$as_me:$LINENO: checking for cross-compile version of gcc" >&5
echo $ECHO_N "checking for cross-compile version of gcc... $ECHO_C" >&6
if test "${ac_cv_cross+set}" = set; then
@@ -4766,10 +4763,6 @@ echo "${ECHO_T}yes (standard debugging)" >&6
fi
- cat >>confdefs.h <<\_ACEOF
-#define TCL_CFG_DEBUG 1
-_ACEOF
-
if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then
diff --git a/win/tcl.m4 b/win/tcl.m4
index 1d458b8..bbea9a3 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -317,7 +317,6 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [
fi
AC_SUBST(CFLAGS_DEFAULT)
AC_SUBST(LDFLAGS_DEFAULT)
- AC_DEFINE(TCL_CFG_DEBUG)
if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then
AC_DEFINE(TCL_MEM_DEBUG, 1, [Is memory debugging enabled?])
@@ -418,9 +417,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
if test "$GCC" = "yes"; then
- if test "$TCL_CC" = "gcc"; then
- CFLAGS="$CFLAGS -mwin32"
- fi
AC_CACHE_CHECK(for cross-compile version of gcc,
ac_cv_cross,
AC_TRY_COMPILE([