summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2003-08-18 07:29:21 (GMT)
committermdejong <mdejong>2003-08-18 07:29:21 (GMT)
commit1a45fbc6d755cd073a86f13bda16808795b2c844 (patch)
tree58214ff636bec10aaa1917d154b01f3d303f0a5e
parentc240a7ed4076ed9248067262a158dd013048c68d (diff)
downloadtk-1a45fbc6d755cd073a86f13bda16808795b2c844.zip
tk-1a45fbc6d755cd073a86f13bda16808795b2c844.tar.gz
tk-1a45fbc6d755cd073a86f13bda16808795b2c844.tar.bz2
* win/configure: Regen.
* win/tcl.m4: Update from Tcl to fix Tcl bug 781109.
-rw-r--r--ChangeLog6
-rwxr-xr-xwin/configure40
-rw-r--r--win/tcl.m459
3 files changed, 105 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6963db1..539ae71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-18 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * win/configure: Regen.
+ * win/tcl.m4: Update from Tcl to fix
+ Tcl bug 781109.
+
2003-08-15 Donal K. Fellows <fellowsd@cs.man.ac.uk>
* generic/tkImgPhoto.c (ImgPhotoCmd): Faster color data parsing
diff --git a/win/configure b/win/configure
index 56e4200..90704a6 100755
--- a/win/configure
+++ b/win/configure
@@ -2774,6 +2774,25 @@ echo "$as_me: WARNING: \"could not find 64-bit SDK to enable 64bit mode\"" >&2;}
CFLAGS_OPTIMIZE="-nologo -Oti -Gs -GD ${runtime}"
STLIB_LD="lib -nologo"
LINKBIN="link -link50compat"
+
+ # TIP #59
+ # A check borrowed from 'rules.vc' to determine if the
+ # compiler actually supports optimization. If not we do
+ # not try to use this feature.
+
+ lines=`$(CC) -nologo -Ox -c -Zs -TC -Fdtemp nul 2>&1 | grep "D4002" | wc -l`
+
+ for f in temp.idb temp.pdb ; do
+ if -f $f ; then
+ rm -f $f
+ fi
+ done
+ if $lines -gt 0 ; then
+ OPTIMIZING=1
+ else
+ OPTIMIZING=0
+ CFLAGS_OPTIMIZE="-nologo -Oti -Gs -GD ${runtime}"
+ fi
fi
SHLIB_LD="${LINKBIN} -dll -nologo -incremental:no"
@@ -2804,6 +2823,13 @@ echo "$as_me: WARNING: \"could not find 64-bit SDK to enable 64bit mode\"" >&2;}
LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}"
fi
+ if test "$do64bit" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
+#define TCL_CFG_DO64BIT 1
+_ACEOF
+
+ fi
+
# DL_LIBS is empty, but then we match the Unix version
@@ -3449,6 +3475,16 @@ fi;
DBGX=""
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
+
+ # Use result from SC_CONFIG_CFLAGS to determine if
+ # optimization is truly active.
+
+ if test "$OPTIMIZING" = "1" ; then
+ cat >>confdefs.h <<\_ACEOF
+#define TCL_CFG_OPTIMIZED 1
+_ACEOF
+
+ fi
else
CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)'
@@ -3460,6 +3496,10 @@ 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
cat >>confdefs.h <<\_ACEOF
diff --git a/win/tcl.m4 b/win/tcl.m4
index 4a2037b..75e3352 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -301,6 +301,13 @@ AC_DEFUN(SC_ENABLE_SYMBOLS, [
LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
DBGX=""
AC_MSG_RESULT([no])
+
+ # Use result from SC_CONFIG_CFLAGS to determine if
+ # optimization is truly active.
+
+ if test "$OPTIMIZING" = "1" ; then
+ AC_DEFINE(TCL_CFG_OPTIMIZED)
+ fi
else
CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)'
@@ -311,6 +318,7 @@ 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)
@@ -600,6 +608,25 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
CFLAGS_OPTIMIZE="-nologo -Oti -Gs -GD ${runtime}"
STLIB_LD="lib -nologo"
LINKBIN="link -link50compat"
+
+ # TIP #59
+ # A check borrowed from 'rules.vc' to determine if the
+ # compiler actually supports optimization. If not we do
+ # not try to use this feature.
+
+ lines=`$(CC) -nologo -Ox -c -Zs -TC -Fdtemp nul 2>&1 | grep "D4002" | wc -l`
+
+ for f in temp.idb temp.pdb ; do
+ if [ -f $f ]; then
+ rm -f $f
+ fi
+ done
+ if [ $lines -gt 0 ]; then
+ OPTIMIZING=1
+ else
+ OPTIMIZING=0
+ CFLAGS_OPTIMIZE="-nologo -Oti -Gs -GD ${runtime}"
+ fi
fi
SHLIB_LD="${LINKBIN} -dll -nologo -incremental:no"
@@ -630,6 +657,10 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}"
fi
+ if test "$do64bit" = "yes" ; then
+ AC_DEFINE(TCL_CFG_DO64BIT)
+ fi
+
# DL_LIBS is empty, but then we match the Unix version
AC_SUBST(DL_LIBS)
AC_SUBST(CFLAGS_DEBUG)
@@ -726,3 +757,31 @@ AC_DEFUN(SC_PROG_TCLSH, [
fi
AC_SUBST(TCLSH_PROG)
])
+
+#--------------------------------------------------------------------
+# SC_TCL_CFG_ENCODING TIP #59
+#
+# Declare the encoding to use for embedded configuration information.
+#
+# Arguments:
+# None.
+#
+# Results:
+# Might append to the following vars:
+# DEFS (implicit)
+#
+# Will define the following vars:
+# TCL_CFGVAL_ENCODING
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN(SC_TCL_CFG_ENCODING, [
+ AC_ARG_WITH(encoding, [ --with-encoding encoding for configuration values], with_tcencoding=${withval})
+
+ if test x"${with_tcencoding}" != x ; then
+ AC_DEFINE_UNQUOTED(TCL_CFGVAL_ENCODING,"${with_tcencoding}")
+ else
+ # Default encoding on windows is not "iso8859-1"
+ AC_DEFINE(TCL_CFGVAL_ENCODING,"cp1252")
+ fi
+])