diff options
| author | mdejong <mdejong> | 2001-05-23 10:29:46 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2001-05-23 10:29:46 (GMT) |
| commit | 7a0d64115868997a8e31574dd0faf640335e2169 (patch) | |
| tree | 5391c64dec3bab8141e9251b9fb59684c14245ed /unix/tcl.m4 | |
| parent | 3699d0068e1a09bb520dc135db2035a05f39ecd7 (diff) | |
| download | tk-7a0d64115868997a8e31574dd0faf640335e2169.zip tk-7a0d64115868997a8e31574dd0faf640335e2169.tar.gz tk-7a0d64115868997a8e31574dd0faf640335e2169.tar.bz2 | |
* unix/configure:
* unix/tcl.m4:
* win/configure:
* win/tcl.m4: Sync from Tcl sources.
Diffstat (limited to 'unix/tcl.m4')
| -rw-r--r-- | unix/tcl.m4 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index efe87cf..908b6ab 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -248,10 +248,10 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [ #------------------------------------------------------------------------ AC_DEFUN(SC_LOAD_TKCONFIG, [ - AC_MSG_CHECKING([for existence of $TCLCONFIG]) + AC_MSG_CHECKING([for existence of $TK_BIN_DIR/tkConfig.sh]) if test -f "$TK_BIN_DIR/tkConfig.sh" ; then - AC_MSG_CHECKING([loading $TK_BIN_DIR/tkConfig.sh]) + AC_MSG_RESULT([loading]) . $TK_BIN_DIR/tkConfig.sh else AC_MSG_RESULT([could not find $TK_BIN_DIR/tkConfig.sh]) @@ -398,8 +398,8 @@ AC_DEFUN(SC_ENABLE_THREADS, [ # --enable-symbols # # Defines the following vars: -# CFLAGS_DEFAULT Sets to CFLAGS_DEBUG if true -# Sets to CFLAGS_OPTIMIZE if false +# CFLAGS_DEFAULT Sets to $(CFLAGS_DEBUG) if true +# Sets to $(CFLAGS_OPTIMIZE) if false # LDFLAGS_DEFAULT Sets to LDFLAGS_DEBUG if true # Sets to LDFLAGS_OPTIMIZE if false # DBGX Debug library extension @@ -409,13 +409,14 @@ AC_DEFUN(SC_ENABLE_THREADS, [ AC_DEFUN(SC_ENABLE_SYMBOLS, [ AC_MSG_CHECKING([for build with symbols]) AC_ARG_ENABLE(symbols, [ --enable-symbols build with debugging symbols [--disable-symbols]], [tcl_ok=$enableval], [tcl_ok=no]) +# FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT. if test "$tcl_ok" = "yes"; then - CFLAGS_DEFAULT="${CFLAGS_DEBUG}" + CFLAGS_DEFAULT='$(CFLAGS_DEBUG)' LDFLAGS_DEFAULT="${LDFLAGS_DEBUG}" DBGX=g AC_MSG_RESULT([yes]) else - CFLAGS_DEFAULT="${CFLAGS_OPTIMIZE}" + CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)' LDFLAGS_DEFAULT="${LDFLAGS_OPTIMIZE}" DBGX="" AC_MSG_RESULT([no]) |