diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-11 22:03:53 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-11 22:03:53 (GMT) |
| commit | a3c8bde133c8b45cb260d20994d845acc133f071 (patch) | |
| tree | f9b1ad1499676bdd543cf30c9dfbaec02007cf3e /win/tcl.m4 | |
| parent | 3edf8c2d2a1364716f801d13faa894e4531f7a8a (diff) | |
| download | tk-a3c8bde133c8b45cb260d20994d845acc133f071.zip tk-a3c8bde133c8b45cb260d20994d845acc133f071.tar.gz tk-a3c8bde133c8b45cb260d20994d845acc133f071.tar.bz2 | |
sync tcl.m4 with Tcl, format tkInt.decls like Tk8.5/8.6
Diffstat (limited to 'win/tcl.m4')
| -rwxr-xr-x | win/tcl.m4 | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -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]) else CFLAGS_DEFAULT='$(CFLAGS_DEBUG)' @@ -317,12 +317,12 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [ AC_SUBST(LDFLAGS_DEFAULT) 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 @@ -414,6 +414,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([ |