diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | unix/configure.in | 4 | ||||
| -rw-r--r-- | unix/tcl.m4 | 12 |
3 files changed, 16 insertions, 7 deletions
@@ -1,3 +1,10 @@ +2005-06-21 Donal K. Fellows <dkf@users.sf.net> + + * unix/tcl.m4 (SC_ENABLE_SYMBOLS): Only enable the 'compile' + special debugging feature when requested in configure.in; removes + irrelevant junk from the configure files of extensions that use + Tcl's tcl.m4. + 2005-06-20 Donal K. Fellows <dkf@users.sf.net> * generic/tclCompile.h (INST_PUSH_RETURN_OPTIONS): New opcode to allow diff --git a/unix/configure.in b/unix/configure.in index f4b36ed..08896a4 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.134 2005/06/07 14:03:52 dkf Exp $ +# RCS: @(#) $Id: configure.in,v 1.135 2005/06/21 08:51:23 dkf Exp $ AC_INIT([tcl],[8.5]) AC_PREREQ(2.57) @@ -108,7 +108,7 @@ SC_ENABLE_SHARED SC_CONFIG_CFLAGS -SC_ENABLE_SYMBOLS +SC_ENABLE_SYMBOLS(bccdebug) #-------------------------------------------------------------------- # Detect what compiler flags to set for 64-bit support. diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 74c181b..10335ad 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -603,20 +603,22 @@ AC_DEFUN(SC_ENABLE_SYMBOLS, [ fi AC_SUBST(CFLAGS_DEFAULT) AC_SUBST(LDFLAGS_DEFAULT) + ### FIXME: Surely TCL_CFG_DEBUG should be set to whether we're debugging? AC_DEFINE(TCL_CFG_DEBUG, 1, [Is debugging enabled?]) if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then 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, 1, [Is bytecode debugging enabled?]) - AC_DEFINE(TCL_COMPILE_STATS, 1, [Are bytecode statistics enabled?]) - fi + ifelse($1,bccdebug,dnl Only enable 'compile' for the Tcl core itself + if test "$tcl_ok" = "compile" -o "$tcl_ok" = "all"; then + 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 if test "$tcl_ok" = "all"; then - AC_MSG_RESULT([enabled symbols mem compile debugging]) + AC_MSG_RESULT([enabled symbols mem ]ifelse($1,bccdebug,[compile ])[debugging]) else AC_MSG_RESULT([enabled $tcl_ok debugging]) fi |