summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2003-10-06 19:11:11 (GMT)
committerhobbs <hobbs>2003-10-06 19:11:11 (GMT)
commit69baf768e2f48d48b91bad42ea851df7b22a6849 (patch)
tree0608f0a22d136f3552134474309dbaf5604efa4e
parent3abc1cebe83395f30484e75495cca0bfe6b74480 (diff)
downloadtk-69baf768e2f48d48b91bad42ea851df7b22a6849.zip
tk-69baf768e2f48d48b91bad42ea851df7b22a6849.tar.gz
tk-69baf768e2f48d48b91bad42ea851df7b22a6849.tar.bz2
* 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.
-rw-r--r--ChangeLog31
-rwxr-xr-xwin/configure26
-rw-r--r--win/tcl.m426
3 files changed, 21 insertions, 62 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d288b6..f6119a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,19 +1,26 @@
-2003-10-06 Don Porter <dgp@users.sourceforge.net>
+2003-10-06 Jeff Hobbs <jeffh@ActiveState.com>
- *unix/configure.in: Reconfigured to use $TCL_PREFIX as the
- default value of --prefix, and also added warning when a TK_PREFIX
- value different from TCL_PREFIX is selected, since [package require Tk]
- fails in that configuration. [Bugs 428627,765642]
+ * 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>
+
+ * unix/configure.in: Reconfigured to use $TCL_PREFIX as the
+ default value of --prefix, and also added warning when a TK_PREFIX
+ value different from TCL_PREFIX is selected, since [package require Tk]
+ fails in that configuration. [Bugs 428627,765642]
- * unix/tcl.m4 (SC_PATH_TCLCONFIG): Corrected search path so
- that alpha and beta releases of Tcl are not favored. [Bug 608698]
+ * unix/tcl.m4 (SC_PATH_TCLCONFIG): Corrected search path so
+ that alpha and beta releases of Tcl are not favored. [Bug 608698]
- * unix/configure.in: Added check that version of Tcl header found
- by configure matches that of the Tk we wish to build. As long as
- the Tk sources insist on lockstep releases, Tk's configuration should
- verify that's what we have. [Bug 749088]
+ * unix/configure.in: Added check that version of Tcl header found
+ by configure matches that of the Tk we wish to build. As long as
+ the Tk sources insist on lockstep releases, Tk's configuration should
+ verify that's what we have. [Bug 749088]
- * unix/configure: autoconf (2.57)
+ * unix/configure: autoconf (2.57)
2003-10-03 Pat Thoyts <patthoyts@users.sourceforge.net>
diff --git a/win/configure b/win/configure
index 90704a6..8d505c1 100755
--- a/win/configure
+++ b/win/configure
@@ -2774,25 +2774,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"
@@ -3476,15 +3457,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"