diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-12 20:41:40 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-12 20:41:40 (GMT) |
| commit | 0a059e0ac765f91e397cbf13a617b6ffe6b1c02a (patch) | |
| tree | 5fd570527bd745435c774b5b7745a11bf516d6a0 /win | |
| parent | c748766c59dabb2bec19ab6e3a9f3b3b66975a9b (diff) | |
| parent | f2067061a65c27001d806ced018ed3d2a34a35de (diff) | |
| download | tk-0a059e0ac765f91e397cbf13a617b6ffe6b1c02a.zip tk-0a059e0ac765f91e397cbf13a617b6ffe6b1c02a.tar.gz tk-0a059e0ac765f91e397cbf13a617b6ffe6b1c02a.tar.bz2 | |
minor clean-up of tkInt.decls
disallow colors like xellow
configure changes for cygwin
Diffstat (limited to 'win')
| -rw-r--r-- | win/configure.in | 14 | ||||
| -rw-r--r-- | win/tcl.m4 | 11 |
2 files changed, 14 insertions, 11 deletions
diff --git a/win/configure.in b/win/configure.in index ffff819..75c9e7a 100644 --- a/win/configure.in +++ b/win/configure.in @@ -75,6 +75,13 @@ SC_ENABLE_THREADS SC_ENABLE_SHARED #-------------------------------------------------------------------- +# Locate and source the tclConfig.sh file. +#-------------------------------------------------------------------- + +SC_PATH_TCLCONFIG($TK_PATCH_LEVEL) +SC_LOAD_TCLCONFIG + +#-------------------------------------------------------------------- # The statements below define a collection of compile flags. This # macro depends on the value of SHARED_BUILD, and should be called # after SC_ENABLE_SHARED checks the configure switches. @@ -128,13 +135,6 @@ TK_DBGX=${DBGX} SC_EMBED_MANIFEST(wish.exe.manifest) -#-------------------------------------------------------------------- -# Locate and source the tclConfig.sh file. -#-------------------------------------------------------------------- - -SC_PATH_TCLCONFIG($TK_PATCH_LEVEL) -SC_LOAD_TCLCONFIG - SC_BUILD_TCLSH SC_PROG_TCLSH @@ -38,7 +38,6 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ AC_MSG_ERROR(There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?) fi TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../unix; pwd` - CFLAGS="$CFLAGS -mwin32" fi AC_MSG_RESULT($TCL_BIN_DIR/tclConfig.sh) ]) @@ -304,6 +303,7 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [ CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)' LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)' DBGX="" + AC_DEFINE(NDEBUG, 1, [Is no debugging enabled?]) AC_MSG_RESULT([no]) AC_DEFINE(TCL_CFG_OPTIMIZED) @@ -320,12 +320,12 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [ AC_DEFINE(TCL_CFG_DEBUG) if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then - AC_DEFINE(TCL_MEM_DEBUG) + AC_DEFINE(TCL_MEM_DEBUG, 1, [Is memory debugging enabled?]) fi if test "$tcl_ok" = "compile" -o "$tcl_ok" = "all"; then - AC_DEFINE(TCL_COMPILE_DEBUG) - AC_DEFINE(TCL_COMPILE_STATS) + AC_DEFINE(TCL_COMPILE_DEBUG, 1, [Is bytecode debugging enabled?]) + AC_DEFINE(TCL_COMPILE_STATS, 1, [Are bytecode statistics enabled?]) fi if test "$tcl_ok" != "yes" -a "$tcl_ok" != "no"; then @@ -418,6 +418,9 @@ 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([ |