summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rwxr-xr-xwin/configure26
-rw-r--r--win/tcl.m426
3 files changed, 9 insertions, 50 deletions
diff --git a/ChangeLog b/ChangeLog
index 395e2bf..51f7bbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-06 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * win/configure:
+ * win/tcl.m4: removed incorrect checks for existence of
+ optimization. TCL_CFG_OPTIMIZED is now defined whenever the user
+ does not build with --enable-symbols.
+
2003-10-06 Don Porter <dgp@users.sourceforge.net>
* tests/fCmd.test (fCmd-8.2): Test only that tilde-substitution
diff --git a/win/configure b/win/configure
index 8893cbd..eb4ea6f 100755
--- a/win/configure
+++ b/win/configure
@@ -3267,25 +3267,6 @@ 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"
@@ -3354,15 +3335,10 @@ fi;
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
+ cat >>confdefs.h <<\_ACEOF
#define TCL_CFG_OPTIMIZED 1
_ACEOF
- fi
else
CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)'
diff --git a/win/tcl.m4 b/win/tcl.m4
index 75e3352..f263325 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -302,12 +302,7 @@ AC_DEFUN(SC_ENABLE_SYMBOLS, [
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
+ AC_DEFINE(TCL_CFG_OPTIMIZED)
else
CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)'
@@ -608,25 +603,6 @@ 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"